From 95ca71d7d33d803a87bebfe8a41c2749f14b2432 Mon Sep 17 00:00:00 2001 From: burnus Date: Wed, 16 Feb 2011 17:44:45 +0000 Subject: [PATCH] 2011-02-16 Tobias Burnus PR libgomp/47758 * testsuite/libgomp.fortran/fortran.exp: Check for the existence of libquadmath.a before adding its libpath to ldflags. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170216 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 6 ++++++ libgomp/testsuite/libgomp.fortran/fortran.exp | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index e2844762002..87491a1b2db 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2011-02-16 Tobias Burnus + + PR libgomp/47758 + * testsuite/libgomp.fortran/fortran.exp: Check for the existence + of libquadmath.a before adding its libpath to ldflags. + 2011-02-14 Jakub Jelinek PR libgomp/47731 diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 5529f191ed9..87db855ba60 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -37,10 +37,7 @@ if { $lang_test_file_found } { # Gather a list of all tests. set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]] - if { $blddir != "" } { - # 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. + 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}/" -- 2.11.0