]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Sync the atomic_link_flags implementation with GCC.
authorIain Sandoe <iain@sandoe.co.uk>
Mon, 18 Mar 2024 09:57:33 +0000 (09:57 +0000)
committerIain Sandoe <iain@sandoe.co.uk>
Mon, 29 Apr 2024 07:04:48 +0000 (08:04 +0100)
For Darwin, in order to allow uninstalled testing, we need to provide
a '-B' option pointing to each path containing an uninstalled library
that we are using (these get appended to the embedded runpaths).

This updates the version of the atomic_link_flags proc in the libstdc++
testsuite to do the same as the one in the GCC testsuite.

libstdc++-v3/ChangeLog:

* testsuite/lib/dg-options.exp (atomic_link_flags): Emit a -B
option for the path to the uninstalled libatomic.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
(cherry picked from commit 71a44faa8a4f76d68356c66c6054e6c242df820f)

libstdc++-v3/testsuite/lib/dg-options.exp

index 872768f26201aed9f4df7857762263f35078b2d2..6e27bd04be7abf926b3d07b8ffa1d0ae65575e2b 100644 (file)
@@ -274,7 +274,7 @@ proc atomic_link_flags { paths } {
       if { [file exists "${gccpath}/libatomic/.libs/libatomic.a"]
            || [file exists "${gccpath}/libatomic/.libs/libatomic.${shlib_ext}"] } {
           append flags " -B${gccpath}/libatomic/ "
-          append flags " -L${gccpath}/libatomic/.libs"
+          append flags " -B${gccpath}/libatomic/.libs"
           append ld_library_path ":${gccpath}/libatomic/.libs"
       }
     } else {