diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | package/Makefile.in | 11 | ||||
| -rw-r--r-- | package/gettext/gettext.mk | 2 |
3 files changed, 9 insertions, 10 deletions
@@ -199,7 +199,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared ############################################################## ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers -else +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) BASE_TARGETS:=uclibc endif TARGETS:= @@ -301,7 +301,7 @@ include toolchain/kernel-headers/kernel-headers.mk include toolchain/mklibs/mklibs.mk include toolchain/sstrip/sstrip.mk include toolchain/uClibc/uclibc.mk -else +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) include toolchain/*/*.mk endif @@ -363,7 +363,7 @@ $(STAGING_DIR): ifeq ($(BR2_TOOLCHAIN_SYSROOT),y) @mkdir -p $(STAGING_DIR)/usr/lib else -ifneq ($(BR2_TOOLCHAIN_EXTERNAL),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) @ln -snf . $(STAGING_DIR)/usr @mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME) @ln -snf ../lib $(STAGING_DIR)/usr/lib diff --git a/package/Makefile.in b/package/Makefile.in index 1e412a653..2bd364013 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -88,9 +88,8 @@ endif TARGET_CXXFLAGS=$(TARGET_CFLAGS) -# else it's an external toolchain ######################################################################### -else +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) --sysroot $(STAGING_DIR)/ TARGET_CXXFLAGS=$(TARGET_CFLAGS) TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/ @@ -115,7 +114,7 @@ GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX) TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)- KERNEL_CROSS=$(TARGET_CROSS) -else +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) TOOLCHAIN_DIR=$(BASE_DIR)/toolchain @@ -139,10 +138,10 @@ TARGET_NM=$(TARGET_CROSS)nm TARGET_RANLIB=$(TARGET_CROSS)ranlib TARGET_OBJCOPY=$(TARGET_CROSS)objcopy TARGET_OBJDUMP=$(TARGET_CROSS)objdump -ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -TARGET_LDCONFIG=/sbin/ldconfig -else +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +TARGET_LDCONFIG=/sbin/ldconfig endif ifeq ($(BR2_STRIP_strip),y) STRIP_DISCARD_ALL:=--discard-all diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index dbc1f2cfa..81ab9debc 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -29,7 +29,7 @@ $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE) $(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux touch $@ -ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y) IGNORE_EXTERNAL_GETTEXT:=--with-included-gettext endif |