diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2023-01-31 11:38:15 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2023-01-31 23:28:12 +0100 |
| commit | 94cacee20d817d0b937701b6759bb67dba3ee3f9 (patch) | |
| tree | b73e5e39ef4e4093988b009412d9109ea12524ab /gcc | |
| parent | b2ec2504af77b35e748067eeb846821d12a6b6b4 (diff) | |
| download | gcc-94cacee20d817d0b937701b6759bb67dba3ee3f9.zip gcc-94cacee20d817d0b937701b6759bb67dba3ee3f9.tar.gz gcc-94cacee20d817d0b937701b6759bb67dba3ee3f9.tar.bz2 | |
For Modula-2 build-tree testing, also set up paths to compiler libraries
Currently, 'gcc/testsuite/lib/gm2.exp:gm2_link_flags' doesn't set up
paths to compiler libraries (such as libgcc, which libstdc++
may depend on). For example, I see my x86_64-pc-linux-gnu '-m32' testing
not pick up the build-tree libgcc, but instead some random system one,
which (expectedly) doesn't satisfy requirements of other build-tree
libraries:
[...]/build-gcc/gcc/testsuite/gm225/m.x0: /lib/i386-linux-gnu/libgcc_s.so.1: version `GCC_7.0.0' not found (required by [...]/build-gcc/x86_64-pc-linux-gnu/32/libstdc++-v3/src/.libs/libstdc++.so.6)
..., and thus a lot of execution FAILs.
As seen in a number of other '[...]_link_flags' procedures, the standard idiom
seems to be to also consider 'gcc-set-multilib-library-path' for
'ld_library_path'.
gcc/testsuite/
* lib/gm2.exp (gm2_link_flags) [$gccpath != ""]: Also consider
'gcc-set-multilib-library-path' for 'ld_library_path'.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/lib/gm2.exp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp index 7f41e19..da08a56 100644 --- a/gcc/testsuite/lib/gm2.exp +++ b/gcc/testsuite/lib/gm2.exp @@ -316,6 +316,9 @@ proc gm2_link_flags { paths } { } send_log "ld_library_path is ${ld_library_path}\n" } + + global GCC_UNDER_TEST + append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] } set_ld_library_path_env_vars |