diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e7247cf..d0b88ef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +Wed May 23 2001 Jeffrey D. Oldham <oldham@codesourcery.com> + + * lib/g++.exp (g++_include_flags): Use args to compute + get_multilibs. + (g++_link_flags): Likewise. + (g++_init): Pass TOOL_OPTIONS as arguments to two above functions. + 2001-05-22 Joseph S. Myers <jsm28@cam.ac.uk> * gcc.dg/c90-hexfloat-1.c: Add more tests. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index a09c698..bae4b6e 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -79,7 +79,7 @@ proc g++_include_flags { args } { append flags "-I${dir} -I${dir}/src " } - set gccpath [get_multilibs] + set gccpath [get_multilibs ${args}] if { ${HAVE_LIBSTDCXX_V3} } { set odir_v3 [lookfor_file ${gccpath} libstdc++-v3] @@ -98,7 +98,7 @@ proc g++_link_flags { args } { global srcdir global ld_library_path - set gccpath [get_multilibs]; + set gccpath [get_multilibs ${args}]; set libio_dir "" set flags "" set ld_library_path "." @@ -213,8 +213,13 @@ proc g++_init { args } { set ALWAYS_CXXFLAGS "" if ![is_remote host] { - lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags]"; - lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags]"; + if [info exists TOOL_OPTIONS] { + lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags ${TOOL_OPTIONS}]"; + lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags ${TOOL_OPTIONS}]"; + } else { + lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags]"; + lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags]"; + } } if [info exists TOOL_OPTIONS] { |