Commit 70d8f2a1 by Andreas Tobler Committed by Andreas Tobler

libffi-dg.exp: Add DYLD_LIBRARY_PATH for darwin.

2003-11-19  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libffi-dg.exp: Add DYLD_LIBRARY_PATH for darwin.
	Add -lgcc_s to additional flags.

From-SVN: r73726
parent d6fcadb2
2003-11-19 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libffi-dg.exp: Add DYLD_LIBRARY_PATH for darwin.
Add -lgcc_s to additional flags.
2003-11-12 Andreas Tobler <a.tobler@schweiz.ch> 2003-11-12 Andreas Tobler <a.tobler@schweiz.ch>
* configure.in, include/Makefile.am: PR libgcj/11147, install * configure.in, include/Makefile.am: PR libgcj/11147, install
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
load_lib dg.exp load_lib dg.exp
load_lib libgloss.exp load_lib libgloss.exp
# Define libffi callbacks for dg.exp. # Define libffi callbacks for dg.exp.
proc libffi-dg-test-1 { target_compile prog do_what extra_tool_flags } { proc libffi-dg-test-1 { target_compile prog do_what extra_tool_flags } {
...@@ -134,6 +136,7 @@ proc libffi-init { args } { ...@@ -134,6 +136,7 @@ proc libffi-init { args } {
setenv LD_LIBRARYN32_PATH $ld_library_path setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path setenv LD_LIBRARY64_PATH $ld_library_path
setenv LD_LIBRARY_PATH_64 $ld_library_path setenv LD_LIBRARY_PATH_64 $ld_library_path
setenv DYLD_LIBRARY_PATH $ld_library_path
} }
proc libffi_target_compile { source dest type options } { proc libffi_target_compile { source dest type options } {
...@@ -144,6 +147,7 @@ proc libffi_target_compile { source dest type options } { ...@@ -144,6 +147,7 @@ proc libffi_target_compile { source dest type options } {
global ld_library_path global ld_library_path
global libffi_link_flags global libffi_link_flags
global libffi_include global libffi_include
global target_triplet
if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } { if { [target_info needs_status_wrapper]!="" && [info exists gluefile] } {
...@@ -160,7 +164,8 @@ proc libffi_target_compile { source dest type options } { ...@@ -160,7 +164,8 @@ proc libffi_target_compile { source dest type options } {
# search for ffi_mips.h in srcdir, too # search for ffi_mips.h in srcdir, too
lappend options "additional_flags=-I${libffi_include} -I${srcdir}/../include" lappend options "additional_flags=-I${libffi_include} -I${srcdir}/../include"
lappend options "additional_flags=${libffi_link_flags}" lappend options "additional_flags=${libffi_link_flags}"
lappend options "libs= -lffi" lappend options "libs= -lffi -lgcc_s"
verbose "options: $options" verbose "options: $options"
return [target_compile $source $dest $type $options] return [target_compile $source $dest $type $options]
} }
...@@ -255,4 +260,4 @@ if { [info procs saved-dg-test] == [list] } { ...@@ -255,4 +260,4 @@ if { [info procs saved-dg-test] == [list] } {
# Local Variables: # Local Variables:
# tcl-indent-level:4 # tcl-indent-level:4
# End: # End:
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment