[binutils-gdb] Ignore --prefix-file-map compiler option whist running testsuite.

[Nick Clifton]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fa2b501cdcbb7e9e8437f1dfb4b1e939dcb07264

commit fa2b501cdcbb7e9e8437f1dfb4b1e939dcb07264
Author: Matthias Klose <doko@debian.org>
Date:   Thu Jun 29 14:44:52 2023 +0100

    Ignore --prefix-file-map compiler option whist running testsuite.

Diff:
---
 binutils/Makefile.am | 2 +-
 binutils/Makefile.in | 2 +-
 ld/Makefile.am       | 4 ++--
 ld/Makefile.in       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 904785bd549..bb86036dd89 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -214,7 +214,7 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CC_FOR_BUILD="$(CC_FOR_BUILD)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) -O0" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET)) -O0" \
 		$(RUNTESTFLAGS); \
 	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
 	fi
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 0b8b8d48b0d..2de46be1b30 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1837,7 +1837,7 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CC_FOR_BUILD="$(CC_FOR_BUILD)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) -O0" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET)) -O0" \
 		$(RUNTESTFLAGS); \
 	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
 	fi
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 0e025867f5f..c3adbb0ccad 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -992,9 +992,9 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET))" \
 		CXX_FOR_TARGET="$(CXX_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CXXFLAGS_FOR_TARGET))" \
 		OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \
 		SFRAMELIB="$(TESTSFRAMELIB)" \
 		JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 7939cf18eda..d1a56026437 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2688,9 +2688,9 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET))" \
 		CXX_FOR_TARGET="$(CXX_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CXXFLAGS_FOR_TARGET))" \
 		OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \
 		SFRAMELIB="$(TESTSFRAMELIB)" \
 		JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \