From 4091fa5f1bc6c0e1703c7245e0faf76e3bb579a4 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Fri, 4 May 2001 02:58:46 +0000 Subject: [PATCH] Index: gcc/gcc/ChangeLog 2001-05-03 Geoffrey Keating * Makefile.in (site.exp): Set TESTING_IN_BUILD_TREE. Index: gcc/gcc/testsuite/ChangeLog 2001-05-03 Geoffrey Keating * lib/g++.exp (g++_include_flags): Don't use any special flags if TESTING_IN_BUILD_TREE is not defined. (g++_init): Use a plain 'c++' as the compiler if TESTING_IN_BUILD_TREEE is not defined. From-SVN: r41820 --- gcc/ChangeLog | 4 ++++ gcc/Makefile.in | 1 + gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/lib/g++.exp | 6 ++++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9c9e4ca724c..7703fbf4bf9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2001-05-03 Geoffrey Keating + + * Makefile.in (site.exp): Set TESTING_IN_BUILD_TREE. + 2001-05-03 Stephane Carrez * config/m68hc11/m68hc11.md ("bitcmpqi"): New pattern for bitb diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 7b9508ea217..eed46d42af5 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2800,6 +2800,7 @@ site.exp: ./config.status Makefile # CFLAGS is set even though it's empty to show we reserve the right to set it. @echo "set CFLAGS \"\"" >> ./tmp0 @echo "set CXXFLAGS \"-I$(objdir)/../$(target_subdir)libio -I\$$srcdir/../libg++/src -I\$$srcdir/../libio -I\$$srcdir/../libstdc++ -I\$$srcdir/../libstdc++/stl -L$(objdir)/../$(target_subdir)libg++ -L$(objdir)/../$(target_subdir)libstdc++\"" >> ./tmp0 + @echo "set TESTING_IN_BUILD_TREE 1" >> ./tmp0 @echo "set HAVE_LIBSTDCXX_V3 1" >> ./tmp0 # If newlib has been configured, we need to pass -B to gcc so it can find # newlib's crt0.o if it exists. This will cause a "path prefix not used" diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index efe80370147..a26fd2bb864 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2001-05-03 Geoffrey Keating + + * lib/g++.exp (g++_include_flags): Don't use any special flags + if TESTING_IN_BUILD_TREE is not defined. + (g++_init): Use a plain 'c++' as the compiler if + TESTING_IN_BUILD_TREEE is not defined. + 2001-05-02 Jakub Jelinek * g++.old-deja/g++.eh/catch13.C: New test. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 650b49c40a7..02e2f6c89ac 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -66,10 +66,11 @@ proc g++_version { } { proc g++_include_flags { args } { global srcdir global HAVE_LIBSTDCXX_V3 + global TESTING_IN_BUILD_TREE set flags "" - if [is_remote host] { + if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { return "${flags}" } @@ -166,12 +167,13 @@ proc g++_init { args } { global ALWAYS_CXXFLAGS global TOOL_EXECUTABLE TOOL_OPTIONS global GXX_UNDER_TEST + global TESTING_IN_BUILD_TREE if ![info exists GXX_UNDER_TEST] then { if [info exists TOOL_EXECUTABLE] { set GXX_UNDER_TEST $TOOL_EXECUTABLE; } else { - if [is_remote host] { + if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { set GXX_UNDER_TEST [transform c++] } else { set GXX_UNDER_TEST [findfile $base_dir/../g++ "$base_dir/../g++ -B$base_dir/../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]] -- 2.30.2