diff options
Diffstat (limited to 'package/Makefile.in')
| -rw-r--r-- | package/Makefile.in | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index a1e290ff5..d3f51ad5f 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -12,9 +12,7 @@ MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL) # Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME GNU_TARGET_NAME=$(ARCH)-linux -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) -LIBC=uclibc -else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) LIBC=uclibc else LIBC=gnu @@ -35,7 +33,7 @@ endif REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI) -STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sysroot +STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-root ifeq ($(BR2_OPTIMIZE_0),y) TARGET_OPTIMIZATION+=-O0 @@ -108,7 +106,7 @@ TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib TARGET_CXXFLAGS=$(TARGET_CFLAGS) TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR) -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y) TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)- else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) TOOLCHAIN_EXTERNAL_PREFIX=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) @@ -118,8 +116,6 @@ else TOOLCHAIN_EXTERNAL_LOCATION=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) endif TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_LOCATION)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- -else ifeq ($(BR2_TOOLCHAIN_CTNG),y) -TARGET_CROSS=$(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)- endif # Quotes are needed for spaces et al in path components. |