diff options
| author | Jeffrey Oldham <oldham@codesourcery.com> | 2001-06-04 15:23:05 +0000 |
|---|---|---|
| committer | Jeffrey D. Oldham <oldham@gcc.gnu.org> | 2001-06-04 15:23:05 +0000 |
| commit | 6bdfaf09101d7f64d10932aa1d8e48ddc4a8b477 (patch) | |
| tree | 5c9afb0f867883bcb2aaff07acb14c8897333783 | |
| parent | e0e08ac26c828bca4b9323d3139eba9293f3ecf4 (diff) | |
| download | gcc-6bdfaf09101d7f64d10932aa1d8e48ddc4a8b477.zip gcc-6bdfaf09101d7f64d10932aa1d8e48ddc4a8b477.tar.gz gcc-6bdfaf09101d7f64d10932aa1d8e48ddc4a8b477.tar.bz2 | |
g++.exp (g++_include_flags): Change `args' to gccpath's value.
2001-06-04 Jeffrey Oldham <oldham@codesourcery.com>
* lib/g++.exp (g++_include_flags): Change `args' to gccpath's value.
(g++_link_flags): Likewise.
(g++_init): Pass gccpath's value to two previous functions.
From-SVN: r42852
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f933e1ab..f219049 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2001-06-04 Jeffrey Oldham <oldham@codesourcery.com> + + * lib/g++.exp (g++_include_flags): Change `args' to gccpath's value. + (g++_link_flags): Likewise. + (g++_init): Pass gccpath's value to two previous functions. + 2001-06-02 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * gcc.misc-tests/linkage.exp: Use wildcards when matching N32. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index bae4b6e..40e8f90 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -63,7 +63,7 @@ proc g++_version { } { # provide new versions of g++_include_flags and g++_link_flags (both # originally from libgloss.exp) which know about the new gcc tree structure # -proc g++_include_flags { args } { +proc g++_include_flags { paths } { global srcdir global HAVE_LIBSTDCXX_V3 global TESTING_IN_BUILD_TREE @@ -79,7 +79,7 @@ proc g++_include_flags { args } { append flags "-I${dir} -I${dir}/src " } - set gccpath [get_multilibs ${args}] + set gccpath ${paths} if { ${HAVE_LIBSTDCXX_V3} } { set odir_v3 [lookfor_file ${gccpath} libstdc++-v3] @@ -93,12 +93,12 @@ proc g++_include_flags { args } { return "$flags" } -proc g++_link_flags { args } { +proc g++_link_flags { paths } { global rootme global srcdir global ld_library_path - set gccpath [get_multilibs ${args}]; + set gccpath ${paths} set libio_dir "" set flags "" set ld_library_path "." @@ -214,11 +214,11 @@ proc g++_init { args } { if ![is_remote host] { if [info exists TOOL_OPTIONS] { - lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags ${TOOL_OPTIONS}]"; - lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags ${TOOL_OPTIONS}]"; + lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"; + lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"; } else { - lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags]"; - lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags]"; + lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs] ]"; + lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs] ]"; } } |