From a0673ec5f9236dca6ada23f28343c591ccd575e4 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Fri, 16 Apr 2021 20:01:40 +0100 Subject: Testsuite: allow non-installed testing on darwin DYLD_LIBRARY_PATH is now removed from the environment for all system tools, including the shell. Adapt the testsuite and pass the right options to allow testing, even when the compiler and libraries have not been installed. gcc/ChangeLog: * Makefile.in: set ENABLE_DARWIN_AT_RPATH in site.tmp. gcc/testsuite/ChangeLog: * gfortran.dg/coarray/caf.exp: Correctly set libatomic flags. * gfortran.dg/dg.exp: Likewise. * lib/asan-dg.exp: Set correct -B flags. * lib/atomic-dg.exp: Likewise. * lib/target-libpath.exp: Handle ENABLE_DARWIN_AT_RPATH. libatomic/ChangeLog: * testsuite/lib/libatomic.exp: Pass correct flags on darwin. libffi/ChangeLog: * testsuite/lib/libffi.exp: Likewise. libitm/ChangeLog: * testsuite/lib/libitm.exp: Likewise. * testsuite/libitm.c++/c++.exp: Likewise. --- libffi/testsuite/lib/libffi.exp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libffi') diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp index 15d3d5e..611f517 100644 --- a/libffi/testsuite/lib/libffi.exp +++ b/libffi/testsuite/lib/libffi.exp @@ -337,8 +337,13 @@ proc libffi-init { args } { verbose "libffi_dir $libffi_dir" if { $libffi_dir != "" } { set libffi_dir [file dirname ${libffi_dir}] - set libffi_link_flags "-L${libffi_dir}/.libs" - lappend libffi_link_flags "-L${blddircxx}/src/.libs" + if [istarget *-*-darwin*] { + set libffi_link_flags "-B${libffi_dir}/.libs" + lappend libffi_link_flags "-B${blddircxx}/src/.libs" + } else { + set libffi_link_flags "-L${libffi_dir}/.libs" + lappend libffi_link_flags "-L${blddircxx}/src/.libs" + } } set_ld_library_path_env_vars @@ -382,7 +387,7 @@ proc libffi_target_compile { source dest type options } { # Darwin needs a stack execution allowed flag. if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"] - || [istarget "*-*-darwin2*"] } { + || [istarget "x86_64-*-darwin2*"] } { lappend options "additional_flags=-Wl,-allow_stack_execute" lappend options "additional_flags=-Wl,-search_paths_first" } -- cgit v1.1