Merge pull request #18913 from benpicco/macro-prefix-map

makefiles/cflags.inc.mk: don't include absolute path in __FILE__ macro
RIOT-OS · Nov 18, 2022 · e1aa925 · e1aa925
2 parents 2f12276 + 5b35910
commit e1aa925
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/cpu/esp8266/Makefile.include b/cpu/esp8266/Makefile.include
@@ -52,3 +52,5 @@ LINKFLAGS += -Tesp8266.peripherals.ld
 
 LINKFLAGS += -Wl,-wrap=pp_attach
 LINKFLAGS += -Wl,-wrap=pm_attach
+
+OPTIONAL_CFLAGS_BLACKLIST += -fmacro-prefix-map=$(RIOTBASE)/=
diff --git a/makefiles/arch/avr8.inc.mk b/makefiles/arch/avr8.inc.mk
@@ -38,6 +38,7 @@ endif
 OPTIONAL_CFLAGS_BLACKLIST += -Wformat-overflow
 OPTIONAL_CFLAGS_BLACKLIST += -Wformat-truncation
 OPTIONAL_CFLAGS_BLACKLIST += -gz
+OPTIONAL_CFLAGS_BLACKLIST += -fmacro-prefix-map=$(RIOTBASE)/=
 
 ifeq ($(TOOLCHAIN),gnu)
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523

diff --git a/makefiles/cflags.inc.mk b/makefiles/cflags.inc.mk
@@ -95,6 +95,9 @@ OPTIONAL_CFLAGS += -Wformat=2
 OPTIONAL_CFLAGS += -Wformat-overflow
 OPTIONAL_CFLAGS += -Wformat-truncation
 
+# Don't include absolute path in __FILE__ macro
+OPTIONAL_CFLAGS += -fmacro-prefix-map=$(RIOTBASE)/=
+
 # Warn about casts that increase alignment requirements
 OPTIONAL_CFLAGS += -Wcast-align
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,3 +52,5 @@ LINKFLAGS += -Tesp8266.peripherals.ld

		LINKFLAGS += -Wl,-wrap=pp_attach
		LINKFLAGS += -Wl,-wrap=pm_attach

		OPTIONAL_CFLAGS_BLACKLIST += -fmacro-prefix-map=$(RIOTBASE)/=