toolchain: use qstrip

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2009-07-30 17:35:26 +02:00
parent 79c213fbe5
commit af2390c0f4
5 changed files with 17 additions and 32 deletions

View File

@ -3,11 +3,9 @@
# build binutils for use on the host system # build binutils for use on the host system
# #
############################################################# #############################################################
BINUTILS_VERSION:=$(subst ",,$(BR2_BINUTILS_VERSION)) BINUTILS_VERSION:=$(call qstrip,$(BR2_BINUTILS_VERSION))
#")
EXTRA_BINUTILS_CONFIG_OPTIONS=$(strip $(subst ",, $(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS))) EXTRA_BINUTILS_CONFIG_OPTIONS=$(call qstrip,$(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS))
#"))
BINUTILS_SITE:=$(BR2_KERNEL_MIRROR)/linux/devel/binutils BINUTILS_SITE:=$(BR2_KERNEL_MIRROR)/linux/devel/binutils
ifeq ($(BINUTILS_VERSION),2.19.1) ifeq ($(BINUTILS_VERSION),2.19.1)
BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/ BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/

View File

@ -4,21 +4,15 @@
# and arrange to include it soon after invoking make from # and arrange to include it soon after invoking make from
# the top level. # the top level.
GCC_VERSION:=$(strip $(subst ",, $(BR2_GCC_VERSION))) GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
#")) TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
TARGET_OPTIMIZATION:=$(strip $(subst ",, $(BR2_TARGET_OPTIMIZATION))) EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
#"))
EXTRA_GCC_CONFIG_OPTIONS:=$(strip $(subst ",, $(BR2_EXTRA_GCC_CONFIG_OPTIONS)))
#"))
ifeq ($(strip $(subst ",, $(BR2_GCC_IS_SNAP))),y) ifeq ($(call qstrip,$(BR2_GCC_IS_SNAP)),y)
#")) GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
GCC_SNAP_DATE:=$(strip $(subst ",, $(BR2_GCC_SNAP_DATE)))
#"))
else else
GCC_SNAP_DATE:= GCC_SNAP_DATE:=
endif endif
#")))
ifeq ($(BR2_GCC_USE_SJLJ_EXCEPTIONS),y) ifeq ($(BR2_GCC_USE_SJLJ_EXCEPTIONS),y)
GCC_USE_SJLJ_EXCEPTIONS:=--enable-sjlj-exceptions GCC_USE_SJLJ_EXCEPTIONS:=--enable-sjlj-exceptions
@ -57,15 +51,15 @@ ARCH_FPU_SUFFIX:=
endif endif
# some additional defaults # some additional defaults
ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_ARCH))),) ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
# "))) # ")))
GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH) GCC_WITH_ARCH:=--with-arch=$(BR2_GCC_TARGET_ARCH)
endif endif
ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_TUNE))),) ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
# "))) # ")))
GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE) GCC_WITH_TUNE:=--with-tune=$(BR2_GCC_TARGET_TUNE)
endif endif
ifneq ($(strip $(subst ",,$(BR2_GCC_TARGET_ABI))),) ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
# "))) # ")))
GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI) GCC_WITH_ABI:=--with-abi=$(BR2_GCC_TARGET_ABI)
endif endif
@ -95,8 +89,7 @@ endif
# and finally pull in config opts from the user # and finally pull in config opts from the user
EXTRA_TARGET_GCC_CONFIG_OPTIONS+=$(strip $(subst ",, $(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))) EXTRA_TARGET_GCC_CONFIG_OPTIONS+=$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
#"))
ifeq ($(BR2_PREFER_IMA),y) ifeq ($(BR2_PREFER_IMA),y)
# >= 4.x # >= 4.x

View File

@ -3,8 +3,7 @@
# gdb # gdb
# #
###################################################################### ######################################################################
GDB_VERSION:=$(strip $(subst ",, $(BR2_GDB_VERSION))) GDB_VERSION:=$(call qstrip,$(BR2_GDB_VERSION))
#"))
GDB_OFFICIAL_VERSION:=$(GDB_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GDB_RELEASE) GDB_OFFICIAL_VERSION:=$(GDB_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GDB_RELEASE)

View File

@ -7,8 +7,7 @@
# #
############################################################# #############################################################
DEFAULT_KERNEL_HEADERS:=$(strip $(subst ",, $(BR2_DEFAULT_KERNEL_HEADERS))) DEFAULT_KERNEL_HEADERS:=$(call qstrip,$(BR2_DEFAULT_KERNEL_HEADERS))
#"))
LINUX_HEADERS_SITE:=127.0.0.1 LINUX_HEADERS_SITE:=127.0.0.1
LINUX_HEADERS_SOURCE:=unspecified-kernel-headers LINUX_HEADERS_SOURCE:=unspecified-kernel-headers

View File

@ -9,12 +9,10 @@ ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
# setting. # setting.
ifndef UCLIBC_CONFIG_FILE ifndef UCLIBC_CONFIG_FILE
UCLIBC_CONFIG_FILE=$(subst ",, $(strip $(BR2_UCLIBC_CONFIG))) UCLIBC_CONFIG_FILE=$(call qstrip,$(BR2_UCLIBC_CONFIG))
#")
endif endif
UCLIBC_VER:=$(subst ",,$(BR2_UCLIBC_VERSION_STRING)) UCLIBC_VER:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
#")
UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE) UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE)
@ -76,10 +74,8 @@ else
UCLIBC_NOT_TARGET_ENDIAN:=LITTLE UCLIBC_NOT_TARGET_ENDIAN:=LITTLE
endif endif
UCLIBC_ARM_TYPE:=CONFIG_$(strip $(subst ",, $(BR2_ARM_TYPE))) UCLIBC_ARM_TYPE:=CONFIG_$(call qstrip,$(BR2_ARM_TYPE))
#")) UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(strip $(subst ",, $(BR2_SPARC_TYPE)))
#"))
$(DL_DIR)/$(UCLIBC_SOURCE): $(DL_DIR)/$(UCLIBC_SOURCE):
$(call DOWNLOAD,$(UCLIBC_SITE),$(UCLIBC_SOURCE)) $(call DOWNLOAD,$(UCLIBC_SITE),$(UCLIBC_SOURCE))