From 67962076d924f38585df74b04d6b25befda300e0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 18 Feb 2011 21:44:44 +0100 Subject: [PATCH] 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 --- libgomp/ChangeLog | 8 ++++++++ libgomp/testsuite/libgomp.fortran/fortran.exp | 15 ++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 87491a1b2db..fad7c77727b 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2011-02-18 Jakub Jelinek + + 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. + 2011-02-16 Tobias Burnus PR libgomp/47758 diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 87db855ba60..5fa42f4bb94 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" }