From b7b640d8126659ca0803d8bad158917f50d43298 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Fri, 8 Jun 2012 01:52:16 +0000 Subject: Remove REAL_GNU_TARGET_NAME Instead of providing two variables, make GNU_TARGET_NAME give the real target name, and remove REAL_GNU_TARGET_NAME altogether. Signed-off-by: Richard Braun Signed-off-by: Peter Korsgaard --- package/Makefile.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'package/Makefile.in') diff --git a/package/Makefile.in b/package/Makefile.in index df7042c6a..57599c5d4 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -9,8 +9,8 @@ HOSTMAKE :=$(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make) MAKE1:=$(HOSTMAKE) -j1 MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL) -# Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME -GNU_TARGET_NAME=$(ARCH)-linux +# Compute GNU_TARGET_NAME +GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI) ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) LIBC=uclibc @@ -46,9 +46,7 @@ TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc endif 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/$(GNU_TARGET_NAME)/sysroot TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION)) @@ -97,7 +95,7 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS) TARGET_LDFLAGS=$(call qstrip,$(BR2_TARGET_LDFLAGS)) ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y) -TARGET_CROSS=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)- +TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- else TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))- endif @@ -137,7 +135,7 @@ endif ifeq ($(BR2_STRIP_sstrip),y) STRIP_STRIP_UNNEEDED:= STRIP_STRIP_ALL:= -TARGET_STRIP=$(HOST_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip +TARGET_STRIP=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip STRIPCMD=$(TARGET_STRIP) KSTRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded endif -- cgit v1.2.3