toolchain,build: prefer -ffile-prefix-map for gcc-8+

[openwrt/staging/wigyori.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index f1ca735f2ed212c4675c9a99d4591b7d8ac9e4b9..fbf42f725ddddba12c2d4b074347647b46ab23e0 100644 (file)
--- 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