diff --git a/docs/COMPILE-NIX.md b/docs/COMPILE-NIX.md index 90637744..714f3de8 100644 --- a/docs/COMPILE-NIX.md +++ b/docs/COMPILE-NIX.md @@ -5,15 +5,6 @@ To compile for Microsoft Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md) ---- - -[0] Dependencies - -For MacOS, Unicorn requires "pkg-config" package. -Brew users can install this with: - - $ brew install pkg-config - - [1] Tailor Unicorn to your need. Out of 6 archtitectures supported by Unicorn (Arm, Arm64, M68K, Mips, Sparc, diff --git a/docs/COMPILE-WINDOWS.md b/docs/COMPILE-WINDOWS.md index 96c65c45..c56d1649 100644 --- a/docs/COMPILE-WINDOWS.md +++ b/docs/COMPILE-WINDOWS.md @@ -33,22 +33,20 @@ Unicorn can be compiled either on Ubuntu or Windows. $ pacman -S python2 $ pacman -S make - $ pacman -S pkg-config $ pacman -S mingw-w64-i686-toolchain - To compile for Windows 64-bit, run: $ pacman -S python2 $ pacman -S make - $ pacman -S pkg-config $ pacman -S mingw-w64-x86_64-toolchain -- For Cygwin, "make", "gcc-core", "pkg-config", "libpcre-devel", "zlib-devel" +- For Cygwin, "make", "gcc-core", "libpcre-devel", "zlib-devel" are needed. If apt-cyg is available, you can install these with: - $ apt-cyg install make gcc-core pkg-config libpcre-devel zlib-devel + $ apt-cyg install make gcc-core libpcre-devel zlib-devel diff --git a/qemu/configure b/qemu/configure index 78c048f9..3279a8d2 100755 --- a/qemu/configure +++ b/qemu/configure @@ -268,11 +268,6 @@ libtool="${LIBTOOL-${cross_prefix}libtool}" nm="${NM-${cross_prefix}nm}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" -pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" -query_pkg_config() { - "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@" -} -pkg_config=query_pkg_config # If the user hasn't specified ARFLAGS, default to 'rv', just as make does. ARFLAGS="${ARFLAGS-rv}" @@ -595,7 +590,6 @@ for opt do --static) static="yes" LDFLAGS="-static $LDFLAGS" - QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS" ;; --mandir=*) mandir="$optarg" ;; @@ -1065,13 +1059,6 @@ else echo big/little test failed fi -########################################## -# pkg-config probe - -if ! has "$pkg_config_exe"; then - error_exit "pkg-config binary '$pkg_config_exe' not found" -fi - ########################################## # libtool probe