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

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 904785bd549a60ee8c7402fe4ad8b2874091b7b1..bb86036dd895d0b2013433cf9dabafd2cfc138cb 100644 (file)
--- 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 0b8b8d48b0d7dca761394e32493d1250de7fd42b..2de46be1b30d7b1729ad3add8a5853255c40422e 100644 (file)
--- 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 0e025867f5fee8d60e7f2c788d375ba91831db18..c3adbb0ccadacb5060988fe0aa24700b7cb489b4 100644 (file)
--- 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 7939cf18eda2d87231e61d405076600a2f33f727..d1a5602643787c240b5323c6c09b9d2bbc813e79 100644 (file)
--- 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)" \