From c9ae5a27b3b538b907c4ef4f6fe4190e3ca204c1 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 21 May 2000 16:57:14 +0000 Subject: 20000-05-21 H.J. Lu (hjl@gnu.org) * configure: Revert changes made on May 18 and May 19. * Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc directory are used if they exist. Make sure $(build_tooldir)/include is searched for header files, $(build_tooldir)/lib/ for library files. (GCC_FOR_TARGET): Likewise. (CXX_FOR_TARGET): Likewise. --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index b4c4618..f1acbd0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -223,7 +223,7 @@ CC_FOR_TARGET = ` \ ;; \ esac \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/; \ + echo $$r/gcc/xgcc -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -isystem $(build_tooldir)/include; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @@ -237,7 +237,7 @@ CC_FOR_TARGET = ` \ # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ +GCC_FOR_TARGET = $$r/gcc/xgcc -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -I$(build_tooldir)/include CHILL_FOR_TARGET = ` \ if [ -f $$r/gcc/xgcc ] ; then \ @@ -262,7 +262,7 @@ CXX_FOR_TARGET = ` \ ;; \ esac \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/; \ + echo $$r/gcc/g++ -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -I$(build_tooldir)/include; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ -- cgit v1.1