diff options
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/testsuite/lib/libffi.exp | 11 |
1 files changed, 8 insertions, 3 deletions
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" } |