diff options
| author | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-21 15:37:05 +0000 |
|---|---|---|
| committer | froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-21 15:37:05 +0000 |
| commit | 1af4c84890ba19defb394969cfaa80a030f2325f (patch) | |
| tree | 9696a01375533862dd7d7b9865ef253a1d1338e2 /libgomp/testsuite/lib | |
| parent | 50828ed8f6a0f86b90cdf0fdfcbe3e0caac7b3a7 (diff) | |
| download | gcc-1af4c84890ba19defb394969cfaa80a030f2325f.tar.gz | |
* testsuite/libgomp.exp (libgomp_init): Only set things that
depend on blddir if blddir exists.
(libgomp_target_compile): Likewise.
* testsuite/libgomp.c++/c++.exp: Likewise.
* testsuite/libgomp.fortran/fortran.exp: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@139393 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp/testsuite/lib')
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 9aa891f202d..f86f1a18ed0 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -119,10 +119,13 @@ proc libgomp_init { args } { } set ALWAYS_CFLAGS "" - lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/" - lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" + if { $blddir != "" } { + lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/" + lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" + lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs" + } lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/.." - lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs -lgomp" + lappend ALWAYS_CFLAGS "ldflags=-lgomp" # We use atomic operations in the testcases to validate results. if { ([istarget i?86-*-*] || [istarget x86_64-*-*]) @@ -164,8 +167,11 @@ proc libgomp_target_compile { source dest type options } { global lang_library_path global lang_link_flags - if { [info exists lang_test_file] && [file exists "${blddir}/"] } { - lappend options "ldflags=-L${blddir}/${lang_library_path} ${lang_link_flags}" + if { [info exists lang_test_file] } { + if { $blddir != "" } { + lappend options "ldflags=-L${blddir}/${lang_library_path}" + } + lappend options "ldflags=${lang_link_flags}" } if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } { |