From bd4d3cd1017feb469efa3112d2f92408a420be35 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 9 Oct 2019 06:41:00 +0200 Subject: toolchain,build: prefer -ffile-prefix-map for gcc-8+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -ffile-prefix-map=OLD=NEW is an alias for both -fdebug-prefix-map and -fmacro-prefix-map and is available since GCC 8. Co-Developed-by: Andre Heider Signed-off-by: Andre Heider Signed-off-by: Paul Spooren [refactored into separate commit] Signed-off-by: Petr Štetiar --- rules.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rules.mk') diff --git a/rules.mk b/rules.mk index f1ca735f2e..fbf42f725d 100644 --- a/rules.mk +++ b/rules.mk @@ -140,11 +140,11 @@ else TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME) endif -ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),) - ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y) - iremap = -fmacro-prefix-map=$(1)=$(2) - else +ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),) + ifeq ($(CONFIG_GCC_USE_IREMAP),y) iremap = -iremap$(1):$(2) + else + iremap = -ffile-prefix-map=$(1)=$(2) endif endif -- cgit v1.2.3