diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-05 15:24:12 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-05 15:24:12 +0200 |
| commit | 0642da781803160ec93a7b6d39bae921535d7c19 (patch) | |
| tree | 7a94a4eb140d5f2a8b240ae2c50446a4f582eeb8 /package/Makefile.in | |
| parent | 6538b1d1e719778d02830f4d3d2975c36e6555cf (diff) | |
| parent | 4a37bf3b9eb6d34a3fb75140234c21417521ae17 (diff) | |
Merge branch 'qstrip' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/Makefile.in')
| -rw-r--r-- | package/Makefile.in | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index a67c1caf2..0ae5bdbea 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -45,12 +45,10 @@ TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT) TARGET_LDFLAGS+= $(BR2_SYSROOT) endif -CC_TARGET_TUNE_:=$(strip $(subst ",,$(BR2_GCC_TARGET_TUNE))) -#")) -CC_TARGET_ARCH_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ARCH))) -#")) -CC_TARGET_ABI_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ABI))) -#")) +CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE)) +CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH)) +CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI)) + ifneq ($(CC_TARGET_TUNE_),) TARGET_CFLAGS+=-mtune=$(CC_TARGET_TUNE_) endif @@ -99,7 +97,7 @@ TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/ endif ######################################################################### #ifeq ($(BR2_ROOTFS_SUFFIX),) -ROOTFS_SUFFIX:=$(strip $(subst ",, $(BR2_ROOTFS_SUFFIX))) +ROOTFS_SUFFIX:=$(call qstrip,$(BR2_ROOTFS_SUFFIX)) ifeq ($(ROOTFS_SUFFIX),) ROOTFS_SUFFIX:= else @@ -107,7 +105,7 @@ XXXX=xxxx ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX) endif -ifeq ($(strip $(subst ",, $(BR2_FPU_SUFFIX))),y) +ifeq ($(call qstrip,$(BR2_FPU_SUFFIX)),y) COND_ARCH_FPU_SUFFIX:=$(ARCH_FPU_SUFFIX) else COND_ARCH_FPU_SUFFIX:= @@ -124,10 +122,8 @@ 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 -TOOLCHAIN_EXTERNAL_PREFIX:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PREFIX))) -#")) -TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH))) -#")) +TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) +TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) #TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX) TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX) TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" @@ -207,8 +203,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/i[3-9]86/i386/' \ -e 's/xtensa.*/xtensa/' \ ) -GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX)) -#") +GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX)) TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ AR="$(TARGET_AR)" \ @@ -373,7 +368,6 @@ endif # X Windowing system -X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX))) -#")) +X11_PREFIX:=$(call qstrip,$(BR2_X11_PREFIX)) include package/Makefile.autotools.in |