From 8ec9199f17c54e081a0bd120a0cdf8263c83d15d Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 10 Mar 2006 08:30:15 +0000 Subject: [PATCH] - quote HOST_CC. Allows for passing flags along HOST_CC which is sometimes needed on certain architectures. --- package/bash/bash.mk | 4 ++-- package/cvs/cvs.mk | 2 +- package/distcc/distcc.mk | 2 +- package/nano/nano.mk | 2 +- package/ncurses/ncurses.mk | 2 +- package/qte/qte.mk | 8 ++++---- package/readline/readline.mk | 4 ++-- package/rsync/rsync.mk | 2 +- package/wget/wget.mk | 2 +- package/which/which.mk | 2 +- toolchain/ccache/ccache.mk | 4 ++-- toolchain/sstrip/sstrip.mk | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package/bash/bash.mk b/package/bash/bash.mk index e97371833c..71dbbc6dee 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -28,7 +28,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked # ac_cv_func_setvbuf_reversed=no # bash_cv_have_mbstate_t=yes (cd $(BASH_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ @@ -53,7 +53,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked touch $(BASH_DIR)/.configured $(BASH_DIR)/$(BASH_BINARY): $(BASH_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) CC_FOR_BUILD=$(HOSTCC) -C $(BASH_DIR) + $(MAKE) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(BASH_DIR) $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) install diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index e31d95d046..6f4c104bf9 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -20,7 +20,7 @@ $(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_DIR)/.configured: $(CVS_DIR)/.unpacked (cd $(CVS_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ cvs_cv_func_printf_ptr=yes \ ./configure \ diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 0c24de9091..c9b2fe1601 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -19,7 +19,7 @@ $(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) $(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked (cd $(DISTCC_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/nano/nano.mk b/package/nano/nano.mk index e774bfe0d8..f3ec43cf66 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -20,7 +20,7 @@ $(NANO_DIR)/.unpacked: $(DL_DIR)/$(NANO_SOURCE) $(NANO_DIR)/.configured: $(NANO_DIR)/.unpacked (cd $(NANO_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ac_cv_header_regex_h=no \ ./configure \ diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 0081787f0f..980db49dba 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -42,7 +42,7 @@ $(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE) $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist (cd $(NCURSES_DIR); rm -rf config.cache; \ - BUILD_CC=$(HOSTCC) \ + BUILD_CC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ diff --git a/package/qte/qte.mk b/package/qte/qte.mk index ff964796ab..297afbc047 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -136,7 +136,7 @@ $(QTE_QTOPIA_DIR)/.unpacked: $(DL_DIR)/$(QTE_QTOPIA_SOURCE) $(QTE_QTE_DIR)/.configured: $(QTE_QTE_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QTOPIA_DIR)/.unpacked cp $(QTE_QTOPIA_DIR)/src/qt/qconfig-qpe.h $(QTE_QTE_DIR)/src/tools/ (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ $(QTE_QTE_CONFIGURE) -qconfig qpe -keypad-mode -qvfb -depths 4,8,16,32 -xplatform $(BR2_QTE_CROSS_PLATFORM) \ @@ -147,7 +147,7 @@ ifneq ($(BR2_QTE_C_QTE_VERSION),$(BR2_QTE_C_QT3_VERSION)) # this is a host-side build, so we don't use any staging dir stuff, nor any TARGET_CONFIGURE_OPTS $(QTE_QT3_DIR)/.configured: $(QTE_QT3_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/qws/linux-x86-g++; export PATH=$$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ - CC_FOR_BUILD=$(HOSTCC) \ + CC_FOR_BUILD="$(HOSTCC)" \ ./configure \ -fast $(QTE_QT3_CONFIGURE) \ ); @@ -156,7 +156,7 @@ endif $(QTE_QVFB_DIR)/.configured: $(QTE_QVFB_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked (cd $(@D); export QTDIR=`pwd`; export TMAKEPATH=$(QTE_TMAKE_DIR)/lib/linux-g++; export $$QTDIR/bin:$$PATH; export LD_LIBRARY_PATH=$$QTDIR/lib:$$LD_LIBRARY_PATH; echo 'yes' | \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ $(QTE_QVFB_CONFIGURE) \ @@ -171,7 +171,7 @@ $(QTE_QVFB_DIR)/.configured: $(QTE_QVFB_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacke $(QTE_QTOPIA_DIR)/.configured: $(QTE_QTOPIA_DIR)/.unpacked $(QTE_TMAKE_DIR)/.unpacked $(QTE_QTE_DIR)/$(QTE_UIC_BINARY) $(QTE_QTE_DIR)/$(QTE_QVFB_BINARY) $(QTE_QT3_DIR)/.configured (cd $(@D); export QTDIR=$(QTE_QTE_DIR); export QPEDIR=$(QTE_QTOPIA_DIR); export PATH=$(STAGING_DIR)/bin:$$QTDIR/bin:$$PATH; QT3DIR=$(QTE_QTE_DIR); echo 'yes' | \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ $(QTE_QTOPIA_CONFIGURE) --edition phone -no-qtopiadesktop -dqt $(QTE_QT3_DIR) -arch generic -displaysize 160-240 -languages en_US \ diff --git a/package/readline/readline.mk b/package/readline/readline.mk index c4781548b1..1f1f1544b2 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -42,7 +42,7 @@ $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured # Install to Staging area $(STAGING_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY) - BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \ + BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \ $(MAKE1) \ prefix=$(STAGING_DIR) \ exec_prefix=$(STAGING_DIR) \ @@ -62,7 +62,7 @@ $(STAGING_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY) # Install only run-time to Target directory $(TARGET_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY) - BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \ + BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \ $(MAKE1) \ prefix=$(TARGET_DIR) \ libdir=$(TARGET_DIR)/lib \ diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 69d777017e..c110146e62 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -21,7 +21,7 @@ $(RSYNC_DIR)/.unpacked: $(DL_DIR)/$(RSYNC_SOURCE) $(RSYNC_DIR)/.configured: $(RSYNC_DIR)/.unpacked (cd $(RSYNC_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 85765c8861..7655bf765c 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -20,7 +20,7 @@ $(WGET_DIR)/.unpacked: $(DL_DIR)/$(WGET_SOURCE) $(WGET_DIR)/.configured: $(WGET_DIR)/.unpacked (cd $(WGET_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/which/which.mk b/package/which/which.mk index 5cb05766c0..1beab7bee4 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -20,7 +20,7 @@ $(WHICH_DIR)/.unpacked: $(DL_DIR)/$(WHICH_SOURCE) $(WHICH_DIR)/.configured: $(WHICH_DIR)/.unpacked (cd $(WHICH_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD="$(HOSTCC)" \ CFLAGS="$(TARGET_CFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk index 5a49b029bd..9329b21501 100644 --- a/toolchain/ccache/ccache.mk +++ b/toolchain/ccache/ccache.mk @@ -33,7 +33,7 @@ $(CCACHE_DIR1)/.patched: $(CCACHE_DIR1)/.unpacked $(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched mkdir -p $(CCACHE_DIR1) (cd $(CCACHE_DIR1); rm -rf config.cache; \ - CC=$(HOSTCC) \ + CC="$(HOSTCC)" \ $(CCACHE_DIR1)/configure \ --target=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ @@ -43,7 +43,7 @@ $(CCACHE_DIR1)/.configured: $(CCACHE_DIR1)/.patched touch $(CCACHE_DIR1)/.configured $(CCACHE_DIR1)/$(CCACHE_BINARY): $(CCACHE_DIR1)/.configured - $(MAKE) CC=$(HOSTCC) -C $(CCACHE_DIR1) + $(MAKE) CC="$(HOSTCC)" -C $(CCACHE_DIR1) $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY) mkdir -p $(STAGING_DIR)/usr/bin; diff --git a/toolchain/sstrip/sstrip.mk b/toolchain/sstrip/sstrip.mk index d18853118f..e538bdb9a9 100644 --- a/toolchain/sstrip/sstrip.mk +++ b/toolchain/sstrip/sstrip.mk @@ -19,7 +19,7 @@ $(SSTRIP_HOST): $(SSTRIP_SOURCE_FILE) $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/sstrip ln -snf $(REAL_GNU_TARGET_NAME)-sstrip \ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-sstrip - $(HOSTCC) $(SSTRIP_SOURCE_FILE) -o $(SSTRIP_HOST) + "$(HOSTCC)" $(SSTRIP_SOURCE_FILE) -o $(SSTRIP_HOST) sstrip_host: $(SSTRIP_HOST) -- 2.30.2