From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 103193858D35; Thu, 20 Jan 2022 12:30:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 103193858D35 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-6768] libstdc++: Only add valid -L paths to testsuite linker options X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 9b42782366b705d9ecd24020ab35fe7eee045c4e X-Git-Newrev: 5929f253fcdbf24fd47706dd11aafdeac5e9ecb6 Message-Id: <20220120123014.103193858D35@sourceware.org> Date: Thu, 20 Jan 2022 12:30:14 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2022 12:30:14 -0000 https://gcc.gnu.org/g:5929f253fcdbf24fd47706dd11aafdeac5e9ecb6 commit r12-6768-g5929f253fcdbf24fd47706dd11aafdeac5e9ecb6 Author: Jonathan Wakely Date: Thu Jan 20 11:15:27 2022 +0000 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. Diff: --- libstdc++-v3/scripts/testsuite_flags.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index 40dd3d3465e..18748f0f9ce 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} ;; *)