diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-07-05 05:13:20 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-07-05 05:13:20 +0000 |
| commit | cb3903168b18d38d6fc5ea78f1e60cdd470c44d8 (patch) | |
| tree | e2102705c74535c708f66b403d43bd434e657f7d /toolchain | |
| parent | 421765118176a5ea63e1c8c86866d1466bd1b1f7 (diff) | |
Do not override CFLAGS in uClibc. Instead concatenate with the ARCH_CFLAGS. Also, pass only the TARGET_CONFIGURE options that are necessary for building the utilities so that CFLAGS are not passed.
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 2616974f4..c8c23fc7b 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -113,6 +113,8 @@ $(UCLIBC_DIR)/.config: $(UCLIBC_DIR)/.unpacked $(UCLIBC_CONFIG_FILE) -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \ -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \ $(UCLIBC_DIR)/.config + $(SED) 's,^ARCH_CFLAGS=",ARCH_CFLAGS="$(TARGET_CFLAGS) ,g' \ + $(UCLIBC_DIR)/.config ifeq ($(UCLIBC_TARGET_ARCH),arm) $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \ $(UCLIBC_DIR)/.config @@ -346,7 +348,8 @@ $(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/usr/lib/libc.a touch -c $@ $(TARGET_DIR)/usr/bin/ldd: - $(MAKE1) -C $(UCLIBC_DIR) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE1) -C $(UCLIBC_DIR) CC=$(TARGET_CROSS)gcc \ + CPP=$(TARGET_CROSS)cpp LD=$(TARGET_CROSS)ld \ PREFIX=$(TARGET_DIR) utils install_utils ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils |