From e4e2cc4d4b0cc4ad1fafa208e1c6887452727a4e Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Mon, 7 Nov 2016 02:19:56 +0100 Subject: [PATCH] Use already qstripped BR2_TOOLCHAIN_EXTERNAL_PREFIX everywhere The BR2_TOOLCHAIN_EXTERNAL_PREFIX variable is already qstripped and stored in the TOOLCHAIN_EXTERNAL_PREFIX variable in toolchain-external.mk, so use this variable everywhere. This will be useful for a later patch that makes the derivation of TOOLCHAIN_EXTERNAL_PREFIX a little more complex. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour [Arnout: split off into separate patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 2 +- package/wine/wine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 5d591e9a43..bd73219bbf 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -184,7 +184,7 @@ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- else -TARGET_CROSS = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))- +TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- endif # Define TARGET_xx variables for all common binutils/gcc diff --git a/package/wine/wine.mk b/package/wine/wine.mk index d9a0ecf851..47ba90a214 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -34,7 +34,7 @@ WINE_CONF_OPTS = \ # wrapper believes what the real gcc is named, and force the tuple of # the external toolchain, not the one we compute in GNU_TARGET_NAME. ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -WINE_CONF_OPTS += TARGETFLAGS="-b $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))" +WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)" endif ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_RAWMIDI),yyy) -- 2.30.2