diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-24 19:26:27 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-24 19:26:27 +0000 |
| commit | b728c9d49b79ed7f8e8e53cf6878c7abd6dc5e44 (patch) | |
| tree | 5d4d4971056c241d3b8da8ac5482757892194cdd /libgomp | |
| parent | 383bfee3e3dd4ef53998f8cd3343d820d0771a4f (diff) | |
| download | gcc-b728c9d49b79ed7f8e8e53cf6878c7abd6dc5e44.tar.gz | |
libgomp:
* testsuite/libgomp.fortran/fortran.exp: Add paths for libquadmath.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167127 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 4 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index ef34c9a04ee..96281fcbfd9 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2010-11-24 Iain Sandoe <iains@gcc.gnu.org> + + * testsuite/libgomp.fortran/fortran.exp: Add paths for libquadmath. + 2010-11-16 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> Tobias Burnus <burnus@net-b.de> diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index acbfe49e5e3..5529f191ed9 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -1,11 +1,13 @@ load_lib libgomp-dg.exp global shlib_ext +global ALWAYS_CFLAGS set shlib_ext [get_shlib_extension] set lang_library_path "../libgfortran/.libs" set lang_link_flags "-lgfortran" set lang_test_file_found 0 +set quadmath_library_path "../libquadmath/.libs" # Initialize dg. @@ -36,7 +38,13 @@ if { $lang_test_file_found } { set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] if { $blddir != "" } { - set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" + # We could, perhaps, test for the presence of the quad math lib - but if it + # is required then its absence will cause a fail, and if it is not required + # the additions here should be harmless. + lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/${quadmath_library_path}/" + # Allow for spec subsitution. + lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/${quadmath_library_path}/" + set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}:${blddir}/${quadmath_library_path}" } else { set ld_library_path "$always_ld_library_path" } |