X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=e97b3f6491ee6b34f1b1a7dddbf933e26c154348;hb=e08ef42b24f;hp=d90e0ffed09867bc3f39278b7109cdfa523391f1;hpb=da9d760ea1c0450e9e6b1c0cdd5331e633c75887;p=openwrt%2Fopenwrt.git diff --git a/rules.mk b/rules.mk index d90e0ffed0..e97b3f6491 100644 --- a/rules.mk +++ b/rules.mk @@ -140,10 +140,10 @@ else endif ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),) - iremap = -iremap$(1):$(2) - # just overwrite iremap for GCC 8.1 and higher to keep backward compatibility - ifeq ($(CONFIG_GCC_VERSION_8),y) + ifeq ($(CONFIG_GCC_USE_EMBEDDED_PATH_REMAP),y) iremap = -fmacro-prefix-map=$(1)=$(2) + else + iremap = -iremap$(1):$(2) endif endif @@ -269,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 @@ -280,6 +281,7 @@ PATCH:=patch PYTHON:=python INSTALL_BIN:=install -m0755 +INSTALL_SUID:=install -m4755 INSTALL_DIR:=install -d -m0755 INSTALL_DATA:=install -m0644 INSTALL_CONF:=install -m0600