diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-02-18 21:44:44 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-02-18 21:44:44 +0100 |
| commit | 67962076d924f38585df74b04d6b25befda300e0 (patch) | |
| tree | c17582d9b1b3a5b331a857a65de892f5bc9cb97f /libgomp/testsuite/libgomp.fortran | |
| parent | b3c1b8a1d6838854acf96be354339a62ff27599e (diff) | |
| download | gcc-67962076d924f38585df74b04d6b25befda300e0.zip gcc-67962076d924f38585df74b04d6b25befda300e0.tar.gz gcc-67962076d924f38585df74b04d6b25befda300e0.tar.bz2 | |
re PR libgomp/47804 (libgomp LD_LIBRARY_PATH doesn't include path to libgfortran)
PR libgomp/47804
* testsuite/libgomp.fortran/fortran.exp: Check for both
libquadmath.a and libquadmath.${shlib_ext}. If neither exists,
but $blddir != "", still append ${blddir}/${lang_library_path}
to ld_library_path.
From-SVN: r170285
Diffstat (limited to 'libgomp/testsuite/libgomp.fortran')
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 87db855..5fa42f4 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -37,11 +37,16 @@ if { $lang_test_file_found } { # Gather a list of all tests. set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] - if { ($blddir != "") && [file exists "${blddir}/${quadmath_library_path}/libquadmath.a"] } { - 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}" + if { $blddir != "" } { + if { [file exists "${blddir}/${quadmath_library_path}/libquadmath.a"] + || [file exists "${blddir}/${quadmath_library_path}/libquadmath.${shlib_ext}"] } { + 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:${blddir}/${lang_library_path}" + } } else { set ld_library_path "$always_ld_library_path" } |