diff options
Diffstat (limited to 'gcc/testsuite/lib/gfortran.exp')
| -rw-r--r-- | gcc/testsuite/lib/gfortran.exp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp index a4d6e2b5d38..5c35e031d2b 100644 --- a/gcc/testsuite/lib/gfortran.exp +++ b/gcc/testsuite/lib/gfortran.exp @@ -84,7 +84,7 @@ proc gfortran_link_flags { paths } { set gccpath ${paths} set libio_dir "" set flags "" - set ld_library_path "." + set ld_library_path "" set shlib_ext [get_shlib_extension] verbose "shared lib extension: $shlib_ext" @@ -94,11 +94,11 @@ proc gfortran_link_flags { paths } { # for uninstalled testing. append flags "-B${gccpath}/libgfortran/.libs " append flags "-L${gccpath}/libgfortran/.libs " - append ld_library_path ":${gccpath}/libgfortran/.libs" + add_path ld_library_path "${gccpath}/libgfortran/.libs" } if [file exists "${gccpath}/libgfortran/.libs/libgfortran.${shlib_ext}"] { append flags "-L${gccpath}/libgfortran/.libs " - append ld_library_path ":${gccpath}/libgfortran/.libs" + add_path ld_library_path "${gccpath}/libgfortran/.libs" } if [file exists "${gccpath}/libgfortran/libgforbegin.a"] { append flags "-L${gccpath}/libgfortran " @@ -106,8 +106,7 @@ proc gfortran_link_flags { paths } { if [file exists "${gccpath}/libiberty/libiberty.a"] { append flags "-L${gccpath}/libiberty " } - append ld_library_path \ - [gcc-set-multilib-library-path $GFORTRAN_UNDER_TEST] + add_path ld_library_path [find_libgcc_s $GFORTRAN_UNDER_TEST] } set_ld_library_path_env_vars |