diff options
-rw-r--r-- | rules.mk | 6 | ||||
-rw-r--r-- | toolchain/gcc/Config.version | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -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 diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 97c5e50dad..6413e85219 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -10,6 +10,11 @@ config GCC_VERSION_8 default y if GCC_USE_VERSION_8 bool +config GCC_USE_EMBEDDED_PATH_REMAP + default y if GCC_VERSION_8 + default n + bool + config GCC_VERSION string default "5.5.0" if GCC_VERSION_5 |