From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 31 Jan 2023 10:38:15 +0000 (+0100)
Subject: For Modula-2 build-tree testing, also set up paths to compiler libraries
X-Git-Tag: basepoints/gcc-14~1598
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94cacee20d817d0b937701b6759bb67dba3ee3f9;p=thirdparty%2Fgcc.git

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'.
---

diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp
index 7f41e19c89e1..da08a565fc53 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