diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-12-13 01:17:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-12-13 01:17:26 +0000 |
| commit | d48912ffe90018ab5bd70a354cd43dfee088f551 (patch) | |
| tree | c3a2fa47574cc4bfcdd75984560a716c2b5d4fd8 | |
| parent | 73bc4221888e002d271f144492befc4252a4135b (diff) | |
| download | upstream-d48912ffe90018ab5bd70a354cd43dfee088f551.tar.gz upstream-d48912ffe90018ab5bd70a354cd43dfee088f551.tar.bz2 upstream-d48912ffe90018ab5bd70a354cd43dfee088f551.zip | |
hopefully fix occasional uClibc/gcc build failures
SVN-Revision: 9717
| -rw-r--r-- | rules.mk | 4 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 9 |
2 files changed, 7 insertions, 6 deletions
@@ -30,7 +30,7 @@ BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX)) GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION)) SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) -OPTIMIZE_FOR_CPU:=$(ARCH) +OPTIMIZE_FOR_CPU=$(ARCH) DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl) BIN_DIR:=$(TOPDIR)/bin @@ -53,7 +53,7 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),) -include $(TOOLCHAIN_DIR)/info.mk REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux - TARGET_CROSS?=$(OPTIMIZE_FOR_CPU)-linux-uclibc- + TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-linux-uclibc-) endif TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH) diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 66e94eab25..08f267001b 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -64,10 +64,11 @@ define Build/Configure endef UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ - DEVEL_PREFIX=/ \ - RUNTIME_PREFIX=/ \ - HOSTCC="$(HOSTCC)" \ - CPU_CFLAGS="$(TARGET_CFLAGS)" + $(TARGET_CONFIGURE_OPTS) \ + DEVEL_PREFIX=/ \ + RUNTIME_PREFIX=/ \ + HOSTCC="$(HOSTCC)" \ + CPU_CFLAGS="$(TARGET_CFLAGS)" define Build/Compile $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak |