aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-01-20 11:15:27 +0000
committerJonathan Wakely <jwakely@redhat.com>2022-01-20 12:29:29 +0000
commit5929f253fcdbf24fd47706dd11aafdeac5e9ecb6 (patch)
tree0bdc2a4e3b63ca82a95c6ba2f763f2197d75d21a
parent9b42782366b705d9ecd24020ab35fe7eee045c4e (diff)
downloadgcc-5929f253fcdbf24fd47706dd11aafdeac5e9ecb6.zip
gcc-5929f253fcdbf24fd47706dd11aafdeac5e9ecb6.tar.gz
gcc-5929f253fcdbf24fd47706dd11aafdeac5e9ecb6.tar.bz2
libstdc++: Only add valid -L paths to testsuite linker options
The MacOS linker warns about -L arguments that don't exist, which causes all tests to fail for the defauly configuration (because libbacktrace isn't built). libstdc++-v3/ChangeLog: * scripts/testsuite_flags.in: Only add src/filesystem/.libs and src/libbacktrace/.libs to LDFLAGS if those directories exist.
-rwxr-xr-xlibstdc++-v3/scripts/testsuite_flags.in12
1 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in
index 40dd3d3..18748f0f 100755
--- a/libstdc++-v3/scripts/testsuite_flags.in
+++ b/libstdc++-v3/scripts/testsuite_flags.in
@@ -77,9 +77,15 @@ case ${query} in
echo ${PCHFLAGS}
;;
--cxxldflags)
- SECTIONLDFLAGS="@SECTION_LDFLAGS@ @LIBICONV@
- -L${BUILD_DIR}/src/filesystem/.libs
- -L${BUILD_DIR}/src/libbacktrace/.libs"
+ FS_LDFLAGS=
+ BT_LDFLAGS=
+ if [ -d ${BUILD_DIR}/src/filesystem/.libs ]; then
+ FS_LDFLAGS=-L${BUILD_DIR}/src/filesystem/.libs
+ fi
+ if [ -d ${BUILD_DIR}/src/libbacktrace/.libs ]; then
+ BT_LDFLAGS=-L${BUILD_DIR}/src/libbacktrace/.libs
+ fi
+ SECTIONLDFLAGS="@SECTION_LDFLAGS@ @LIBICONV@ $FS_LDFLAGS $BT_LDFLAGS"
echo ${SECTIONLDFLAGS}
;;
*)