diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Makefile.in | 12 | ||||
| -rw-r--r-- | package/binutils/binutils.mk | 6 | ||||
| -rw-r--r-- | package/microperl/microperl.mk | 4 | ||||
| -rw-r--r-- | package/sstrip/sstrip.mk | 2 |
4 files changed, 11 insertions, 13 deletions
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 diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 1c8a79d07..3293e185c 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -27,8 +27,8 @@ BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) # We need to specify host & target to avoid breaking ARM EABI BINUTILS_CONF_OPT = --disable-multilib --disable-werror \ - --host=$(REAL_GNU_TARGET_NAME) \ - --target=$(REAL_GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --enable-shared \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) @@ -40,7 +40,7 @@ endif # "host" binutils should actually be "cross" # We just keep the convention of "host utility" for now HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \ - --target=$(REAL_GNU_TARGET_NAME) \ + --target=$(GNU_TARGET_NAME) \ --disable-shared --enable-static \ --with-sysroot=$(STAGING_DIR) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index 5bf4a2e4d..61187ea9b 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -9,7 +9,7 @@ MICROPERL_SITE = http://www.cpan.org/src/5.0 MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2 MICROPERL_DEPENDENCIES = host-microperl MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION) -MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(REAL_GNU_TARGET_NAME) +MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(GNU_TARGET_NAME) MICROPERL_MODS = $(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES)) # Minimal set of modules required for 'perl -V' to work @@ -72,7 +72,7 @@ define MICROPERL_CONFIGURE_CMDS echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh echo "d_archlib='define'" >>$(@D)/uconfig.sh - echo "archname='$(REAL_GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh + echo "archname='$(GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh echo "osname='linux'" >>$(@D)/uconfig.sh echo "cc='$(TARGET_CC)'" >>$(@D)/uconfig.sh echo "ccflags='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh diff --git a/package/sstrip/sstrip.mk b/package/sstrip/sstrip.mk index 9a5aedecf..a1447d81d 100644 --- a/package/sstrip/sstrip.mk +++ b/package/sstrip/sstrip.mk @@ -6,7 +6,7 @@ SSTRIP_SITE = svn://dev.openwrt.org/openwrt/trunk/tools/sstrip SSTRIP_VERSION = 20154 -HOST_SSTRIP_BINARY = $(REAL_GNU_TARGET_NAME)-sstrip +HOST_SSTRIP_BINARY = $(GNU_TARGET_NAME)-sstrip # This is a kludge to get host-ccache built before us or it fails ifeq ($(BR2_CCACHE),y) |