From patchwork Tue Nov 13 08:42:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/6] pixman: pass tools to configure From: Gerd Hoffmann X-Patchwork-Id: 198593 Message-Id: <1352796133-956-3-git-send-email-kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Date: Tue, 13 Nov 2012 09:42:09 +0100 Complete the set of compiler tool names in config-host.mak, pass them to pixman configure to make sure cross builds work. Based on a patch from Blue Swirl. Signed-off-by: Gerd Hoffmann --- Makefile | 2 +- configure | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index ca14a21..7b267c9 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ subdir-pixman: pixman/Makefile $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) pixman/Makefile: $(SRC_PATH)/pixman/configure - (cd pixman; $(SRC_PATH)/pixman/configure --disable-shared --enable-static) + (cd pixman; CC="$(CC)" LD="$(LD)" AR="$(AR)" NM="$(NM)" RANLIB="$(RANLIB)" $(SRC_PATH)/pixman/configure --disable-shared --enable-static) $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) diff --git a/configure b/configure index 18faded..e7ca78b 100755 --- a/configure +++ b/configure @@ -252,8 +252,10 @@ done cc="${CC-${cross_prefix}gcc}" ar="${AR-${cross_prefix}ar}" +nm="${AR-${cross_prefix}nm}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" +ranlib="${LD-${cross_prefix}ranlib}" libtool="${LIBTOOL-${cross_prefix}libtool}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" @@ -3635,8 +3637,10 @@ echo "CC_I386=$cc_i386" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak echo "OBJCC=$objcc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak +echo "NM=$nm" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak +echo "RANLIB=$ranlib" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak echo "LIBTOOL=$libtool" >> $config_host_mak echo "CFLAGS=$CFLAGS" >> $config_host_mak