[pushed] libstdc++: Sync the atomic_link_flags implementation with GCC.

Iain Sandoe iains.gcc@gmail.com
Tue Mar 19 12:56:57 GMT 2024


This was pre-approved on irc by Jonathan, tested on x86_64-linux,Darwin,
pushed to trunk, thanks,
Iain

--- 8< ---

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>
---
 libstdc++-v3/testsuite/lib/dg-options.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp
index bc387d17ed7..00ca678a53a 100644
--- a/libstdc++-v3/testsuite/lib/dg-options.exp
+++ b/libstdc++-v3/testsuite/lib/dg-options.exp
@@ -314,7 +314,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 {
-- 
2.39.2 (Apple Git-143)



More information about the Libstdc++ mailing list