From d0ace52ec4b477626217cc58705e8bfedd2b4e1a Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Sat, 15 Mar 2014 09:38:11 +1100 Subject: * baseboards/multi-sim.exp (rpath_flags): Add libatomic.so check. Signed-off-by: Ben Elliston --- baseboards/multi-sim.exp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'baseboards') diff --git a/baseboards/multi-sim.exp b/baseboards/multi-sim.exp index f725c6c..c588fd7 100644 --- a/baseboards/multi-sim.exp +++ b/baseboards/multi-sim.exp @@ -58,7 +58,7 @@ proc rpath_flags { args } { set mflags "[board_info $board multilib_flags] [libgloss_include_flags] [newlib_include_flags] [libgloss_link_flags] [libgloss_link_flags]" set rpathflags "" set gccpath [get_multilibs] - foreach i {libgcc_s.so libstdc++.so libgfortran.so libc.so} { + foreach i {libgcc_s.so libstdc++.so libgfortran.so libatomic.so libc.so} { set result [remote_exec host "$compiler $mflags --print-file-name=$i"] set output [lindex $result 1] set rpathdir [file dirname $output] @@ -77,6 +77,11 @@ proc rpath_flags { args } { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libgfortran/.libs" } } + if [string match $i "libatomic.so"] { + if [file exists "$gccpath/libatomic/.libs/libatomic.so"] { + set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libatomic/.libs" + } + } } else { set rpathflags "$rpathflags -Wl,-rpath=$rpathdir" } -- cgit v1.2.3