yann@1: Adjusted for gcc-3.3-20040119
yann@1: 
yann@1: See http://gcc.gnu.org/PR12010
yann@1: 
yann@1: Without this patch, one gets both compile and link time errors in
yann@1: 'make check' when configured for cross-compiling.
yann@1: 
yann@1: In particular, 'make check' on a cross-compiler fails with
yann@1: 
yann@1: /testsuite_flags: /testsuite_flags: No such file or directory
yann@1:     while executing
yann@1: "exec sh ${odir_v3}/testsuite_flags --build-includes"
yann@1:     (procedure "g++_include_flags" line 21)
yann@1:     invoked from within
yann@1: "g++_include_flags [get_multilibs] "
yann@1:     (procedure "g++_init" line 63)
yann@1:     invoked from within
yann@1: "${tool}_init $test_file_name"
yann@1:     (procedure "runtest" line 19)
yann@1: ...
yann@1: make[1]: [check-g++] Error 1 (ignored)
yann@1: 
yann@1: --- gcc-3.3-20040119/gcc/testsuite/lib/g++.exp.orig	2004-01-25 17:56:24.000000000 -0800
yann@1: +++ gcc-3.3-20040119/gcc/testsuite/lib/g++.exp	2004-01-25 18:29:44.000000000 -0800
yann@1: @@ -72,6 +72,8 @@ proc g++_version { } {
yann@1:  #
yann@1:  proc g++_include_flags { paths } {
yann@1:      global srcdir
yann@1: +    global objdir
yann@1: +    global target_triplet
yann@1:      global HAVE_LIBSTDCXX_V3
yann@1:      global TESTING_IN_BUILD_TREE
yann@1:  
yann@1: @@ -90,6 +92,20 @@ proc g++_include_flags { paths } {
yann@1:  
yann@1:      if { ${HAVE_LIBSTDCXX_V3} } {
yann@1:        set odir_v3 [lookfor_file ${gccpath} libstdc++-v3]
yann@1: +      if { $odir_v3 == "" } {
yann@1: +          verbose "g++_include_flags: couldn't find libstdc++-v3 on first try, now looking in build directory $objdir"
yann@1: +          # first assume no multilibs
yann@1: +          set odir_v3 [lookfor_file ${objdir} "$target_triplet/libstdc++-v3"]
yann@1: +      }
yann@1: +      if { $odir_v3 == "" } {
yann@1: +          verbose "g++_include_flags: couldn't find libstdc++-v3 on second try, trying multilib"
yann@1: +          # assume multilib only one level deep
yann@1: +          set multisub [file tail $gccpath]
yann@1: +          set odir_v3 [lookfor_file ${objdir} "$target_triplet/$multisub/libstdc++-v3"]
yann@1: +      }
yann@1: +      if { $odir_v3 == "" } {
yann@1: +           error "Can't find libstdc++-v3"
yann@1: +      }
yann@1:        append flags [exec sh ${odir_v3}/testsuite_flags --build-includes]
yann@1:      } else {
yann@1:        set odir_v2 [lookfor_file ${gccpath} libstdc++]
yann@1: 
yann@1: --- gcc-3.3-20040119/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp.old	Sun Jul 13 10:42:01 2003
yann@1: +++ gcc-3.3-20040119/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp	Sun Jul 13 11:39:54 2003
yann@1: @@ -48,8 +48,23 @@
yann@1:      global ld_library_path
yann@1:      global original_ld_library_path
yann@1:      global tool_root_dir
yann@1: +    global target_triplet
yann@1:  
yann@1:      set blddir [lookfor_file [get_multilibs] libstdc++-v3]
yann@1: +    if { $blddir == "" } {
yann@1: +        set multilibs [get_multilibs]
yann@1: +        # FIXME: assume multilib only one level deep
yann@1: +        set multisub [file tail $multilibs]
yann@1: +        verbose "libstdc++-v3-init: couldn't find libstdc++-v3 in $multilibs, trying $objdir"
yann@1: +        set blddir [lookfor_file ${objdir} "$target_triplet/$multisub/libstdc++-v3"]
yann@1: +    }
yann@1: +    if { $blddir == "" } {
yann@1: +        verbose "libstdc++-v3-init: couldn't find libstdc++-v3, trying $objdir without multilibs"
yann@1: +        set blddir [lookfor_file ${objdir} "$target_triplet/libstdc++-v3"]
yann@1: +    }
yann@1: +    if { $blddir == "" } {
yann@1: +         error "Can't find libstdc++-v3"
yann@1: +    }
yann@1:  
yann@1:      # By default, we assume we want to run program images.
yann@1:      global dg-do-what-default