* configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET,

        CXX_FOR_TARGET): Add -B$$r/gcc/ here.
        (FLAGS_FOR_TARGET): Not here.
        (CHILL_FOR_TARGET, CXX_FOR_TARGET): Don't check the list of languages.

2 files changed, 12 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 29b31e3a6..435634c74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-11  Jason Merrill  <jason@redhat.com>
+
+	* configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET,
+	CXX_FOR_TARGET): Add -B$$r/gcc/ here.
+	(FLAGS_FOR_TARGET): Not here.
+	(CHILL_FOR_TARGET, CXX_FOR_TARGET): Don't check the list of languages.
+
 2000-08-07  DJ Delorie  <dj@redhat.com>
 
 	* configure.in (FLAGS_FOR_TARGET): invert test for xgcc, should mean
diff --git a/configure.in b/configure.in
index 49f81741e..88c6b1736 100644
--- a/configure.in
+++ b/configure.in
@@ -1220,15 +1220,6 @@ else
 fi
 
 FLAGS_FOR_TARGET=
-if test -d ${topsrcdir}/gcc; then
-  # Directories specified with -B are searched for libraries after those
-  # specified with -L, but for headers (in sub-directory `include')
-  # before those specified with -I and -isystem.  Fortunately, we don't
-  # expect include directories to exist in build_tooldir/{bin,lib} (see
-  # below), and we want gcc/include to be searched first.
-  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/gcc/'
-fi
-
 case " $skipdirs " in
 *" target-newlib "*) ;;
 *)
@@ -1270,7 +1261,7 @@ fi
 if test "x${CC_FOR_TARGET+set}" = xset; then
   :
 elif test -d ${topsrcdir}/gcc; then
-  CC_FOR_TARGET='$$r/gcc/xgcc'
+  CC_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/'
 elif test "$host" = "$target"; then
   CC_FOR_TARGET='$(CC)'
 else
@@ -1285,10 +1276,8 @@ esac
 
 if test "x${CHILL_FOR_TARGET+set}" = xset; then
   :
-elif test -d ${topsrcdir}/gcc &&
-   echo ",${enable_languages-`echo ${LANGUAGES-CHILL} | tr ' ' ','`}," |
-   grep ',CHILL,' > /dev/null ; then
-  CHILL_FOR_TARGET='$$r/gcc/xgcc -L$$r/gcc/ch/runtime/'
+elif test -d ${topsrcdir}/gcc; then
+  CHILL_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/'
 elif test "$host" = "$target"; then
   CHILL_FOR_TARGET='$(CC)'
 else
@@ -1301,10 +1290,8 @@ esac
 
 if test "x${CXX_FOR_TARGET+set}" = xset; then
   :
-elif test -d ${topsrcdir}/gcc &&
-   echo ",${enable_languages-`echo ${LANGUAGES-c++} | tr ' ' ','`}," |
-   grep ',c[+][+],' > /dev/null ; then
-  CXX_FOR_TARGET='$$r/gcc/g++ -nostdinc++ '$libstdcxx_flags
+elif test -d ${topsrcdir}/gcc; then
+  CXX_FOR_TARGET='$$r/gcc/g++ -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags
 elif test "$host" = "$target"; then
   CXX_FOR_TARGET='$(CXX)'
 else