KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hopefully fix occasional uClibc/gcc build failures

Browse source 
SVN-Revision: 9717
This commit is contained in:
Felix Fietkau 2007-12-13 01:17:26 +00:00
parent 73bc422188
commit d48912ffe9
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rules.mk
View file

@ -30,7 +30,7 @@ BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX))
GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION)) GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION))
SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR}) 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) DL_DIR:=$(if $(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(call qstrip,$(CONFIG_DOWNLOAD_FOLDER)),$(TOPDIR)/dl)
BIN_DIR:=$(TOPDIR)/bin BIN_DIR:=$(TOPDIR)/bin
@ -53,7 +53,7 @@ ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
-include $(TOOLCHAIN_DIR)/info.mk -include $(TOOLCHAIN_DIR)/info.mk
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux 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 endif
TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH) TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH)

9
toolchain/uClibc/Makefile
View file

@ -64,10 +64,11 @@ define Build/Configure
endef endef
UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
DEVEL_PREFIX=/ \ $(TARGET_CONFIGURE_OPTS) \
RUNTIME_PREFIX=/ \ DEVEL_PREFIX=/ \
HOSTCC="$(HOSTCC)" \ RUNTIME_PREFIX=/ \
CPU_CFLAGS="$(TARGET_CFLAGS)" HOSTCC="$(HOSTCC)" \
CPU_CFLAGS="$(TARGET_CFLAGS)"
define Build/Compile define Build/Compile
$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak