X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=e97b3f6491ee6b34f1b1a7dddbf933e26c154348;hb=refs%2Fheads%2Fbackport-18.06;hp=6b881a0c619c11e63d7504b31e4c16f4271f81bc;hpb=3b9bfe8328e071a33b9dad9fd92cd900697456f0;p=openwrt%2Fstaging%2Fjow.git

diff --git a/rules.mk b/rules.mk
index 6b881a0c61..e97b3f6491 100644
--- a/rules.mk
+++ b/rules.mk
@@ -140,7 +140,11 @@ else
 endif
 
 ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
-  iremap = -iremap$(1):$(2)
+  ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y)
+    iremap = -fmacro-prefix-map=$(1)=$(2)
+  else
+    iremap = -iremap$(1):$(2)
+  endif
 endif
 
 PACKAGE_DIR:=$(BIN_DIR)/packages
@@ -265,6 +269,7 @@ TARGET_CC:=$(TARGET_CROSS)gcc
 TARGET_CXX:=$(TARGET_CROSS)g++
 KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR_HOST)/bin/sed -i -e
+ESED:=$(STAGING_DIR_HOST)/bin/sed -E -i -e
 CP:=cp -fpR
 LN:=ln -sf
 XARGS:=xargs -r