diff options
author | Andreas Tobler <a.tobler@schweiz.org> | 2009-08-05 16:11:54 +0000 |
---|---|---|
committer | Andreas Tobler <andreast@gcc.gnu.org> | 2009-08-05 18:11:54 +0200 |
commit | 78729ee2442cc0068984d6d86055ba2bb67d73b0 (patch) | |
tree | 63b2a7698adb06980c9000aea9aaa13063eba330 /libgomp | |
parent | fd1e840d81c4d581d118ef1890e682fb90a4a72b (diff) | |
download | gcc-78729ee2442cc0068984d6d86055ba2bb67d73b0.tar.gz |
fortran.exp: Add flags in case of shared only build.
2009-08-05 Andreas Tobler <a.tobler@schweiz.org>
* testsuite/libgomp.fortran/fortran.exp: Add flags in case of shared
only build.
From-SVN: r150495
Diffstat (limited to 'libgomp')
-rw-r--r-- | libgomp/ChangeLog | 5 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 6b9592bda73..4f0e5c596d3 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2009-08-05 Andreas Tobler <a.tobler@schweiz.org> + + * testsuite/libgomp.fortran/fortran.exp: Add flags in case of shared + only build. + 2009-08-04 David Daney <ddaney@caviumnetworks.com> * config/linux/mutex.h (gomp_mutex_unlock): Add comment about diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 3d6615ffee7..acbfe49e5e3 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -1,16 +1,25 @@ +load_lib libgomp-dg.exp + +global shlib_ext + +set shlib_ext [get_shlib_extension] set lang_library_path "../libgfortran/.libs" set lang_link_flags "-lgfortran" set lang_test_file_found 0 -load_lib libgomp-dg.exp # Initialize dg. dg-init if { $blddir != "" } { + # Look for a static libgfortran first. if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] { set lang_test_file "${lang_library_path}/libgfortran.a" set lang_test_file_found 1 + # We may have a shared only build, so look for a shared libgfortran. + } elseif [file exists "${blddir}/${lang_library_path}/libgfortran.${shlib_ext}"] { + set lang_test_file "${lang_library_path}/libgfortran.${shlib_ext}" + set lang_test_file_found 1 } else { puts "No libgfortran library found, will not execute fortran tests" } |