diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2014-11-03 09:58:38 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-05-09 14:32:45 +0200 |
| commit | fed3dbbfd1b707d7386b14e724056bfe2234e3a5 (patch) | |
| tree | 6b3409d5a5466dbd98485dd76d1cb02dfc8abd7b /libgomp | |
| parent | b7b209843654bb240589251c90c3465a84d704da (diff) | |
| download | gcc-fed3dbbfd1b707d7386b14e724056bfe2234e3a5.zip gcc-fed3dbbfd1b707d7386b14e724056bfe2234e3a5.tar.gz gcc-fed3dbbfd1b707d7386b14e724056bfe2234e3a5.tar.bz2 | |
libgomp testsuite: Only use 'blddir' if set
(It is unclear to me why the current working directory needs to be in
'LD_LIBRARY_PATH'; leaving that alone for now.)
libgomp/
* testsuite/lib/libgomp.exp (libgomp_init): Only use 'blddir' if
set.
* testsuite/libgomp.c++/c++.exp: Likewise.
* testsuite/libgomp.oacc-c++/c++.exp: Likewise.
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/c++.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c++/c++.exp | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index e12236e..92f6507 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -66,7 +66,6 @@ proc libgomp_init { args } { global srcdir blddir objdir tool_root_dir global libgomp_initialized global tmpdir - global blddir global gluefile wrap_flags global ALWAYS_CFLAGS global CFLAGS @@ -118,7 +117,7 @@ proc libgomp_init { args } { } # Compute what needs to be put into LD_LIBRARY_PATH - set always_ld_library_path ".:${blddir}/.libs" + set always_ld_library_path "." global offload_additional_lib_paths if { $offload_additional_lib_paths != "" } { @@ -157,6 +156,8 @@ proc libgomp_init { args } { lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/.libs" lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/.libs" + + append always_ld_library_path ":${blddir}/.libs" } # The top-level include directory, for gomp-constants.h. lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include" diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index 81c188e..188d1a82 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -62,7 +62,8 @@ if { $lang_test_file_found } { set_ld_library_path_env_vars set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags" - if { [file exists $flags_file] } { + if { $blddir != "" + && [file exists $flags_file] } { set lang_source_re {^.*\.[cC]$} set lang_include_flags [exec sh $flags_file --build-includes] } diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index 0900178..24a4d1f 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -68,7 +68,8 @@ if { $lang_test_file_found } { set_ld_library_path_env_vars set flags_file "${blddir}/../libstdc++-v3/scripts/testsuite_flags" - if { [file exists $flags_file] } { + if { $blddir != "" + && [file exists $flags_file] } { set lang_source_re {^.*\.[cC]$} set lang_include_flags [exec sh $flags_file --build-includes] } |