From 78729ee2442cc0068984d6d86055ba2bb67d73b0 Mon Sep 17 00:00:00 2001
From: Andreas Tobler <a.tobler@schweiz.org>
Date: Wed, 5 Aug 2009 16:11:54 +0000
Subject: [PATCH] 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
---
libgomp/ChangeLog | 5 +++++
libgomp/testsuite/libgomp.fortran/fortran.exp | 11 ++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 6b9592bda731..4f0e5c596d37 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 3d6615ffee7a..acbfe49e5e31 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"
}
--
GitLab