From: Iain Sandoe <iain@sandoe.co.uk>
Date: Sat, 21 Jan 2023 19:52:58 +0000 (+0000)
Subject: Darwin, libffi, testsuite: Ensure we pick up the convenience lib.
X-Git-Tag: basepoints/gcc-14~1929
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4703bd0e15b4ed6e5eae36604b28bd4ca4f8cee;p=thirdparty%2Fgcc.git

Darwin, libffi, testsuite: Ensure we pick up the convenience lib.

For several Darwin linker versions, the link paths are first traversed
looking for shared libraries, and then again looking for archives.

We want the paths to be searched for both shared and archives in order
so that we will find the non-shared libffi in the testsuite (otherwise
the installed version in the system will be found instead).

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

libffi/ChangeLog:

	* testsuite/lib/libffi.exp: Search for both shared and archive
	in each path in turn.
---

diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp
index 7dc7b5d19a3c..15d3d5ebd739 100644
--- a/libffi/testsuite/lib/libffi.exp
+++ b/libffi/testsuite/lib/libffi.exp
@@ -384,6 +384,7 @@ proc libffi_target_compile { source dest type options } {
     if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"]
 	 || [istarget "*-*-darwin2*"] } {
 	lappend options "additional_flags=-Wl,-allow_stack_execute"
+	lappend options "additional_flags=-Wl,-search_paths_first"
     }
 
     # If you're building the compiler with --prefix set to a place