Makefile.in (fixinc.sh): Pass BUILD_LIBERTY as LIBERTY to mkfixinc.sh.

* Makefile.in (fixinc.sh): Pass BUILD_LIBERTY as LIBERTY to
mkfixinc.sh.
* fixinc/mkfixinc.sh (defs): Add LIBERTY.
* configure.in (STMP_FIXINC, STMP_FIXPROTO): Don't disable on
build != host sysrooted builds.
* configure.in (SYSTEM_HEADER_DIR): Make sure it contains
TARGET_SYSTEM_ROOT even on sysrooted natives.
* configure: Rebuilt.

From-SVN: r65462

gcc/ChangeLog

+2003-04-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (fixinc.sh): Pass BUILD_LIBERTY as LIBERTY to
+	mkfixinc.sh.
+	* fixinc/mkfixinc.sh (defs): Add LIBERTY.
+	* configure.in (STMP_FIXINC, STMP_FIXPROTO): Don't disable on
+	build != host sysrooted builds.
+	* configure.in (SYSTEM_HEADER_DIR): Make sure it contains
+	TARGET_SYSTEM_ROOT even on sysrooted natives.
+	* configure: Rebuilt.
+
 2003-04-10  Zack Weinberg  <zack@codesourcery.com>
 
 	* c-decl.c (struct binding_level): Add shadowed_tags and

gcc/Makefile.in

@@ -2490,8 +2490,9 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
 	$(FIXINCSRCDIR)/server.h $(FIXINCSRCDIR)/inclhack.def specs.ready
 	(MAKE="$(MAKE)"; srcdir=`cd $(srcdir)/fixinc && ${PWD}` ; \
 	CC="$(BUILD_CC)"; CFLAGS="$(BUILD_CFLAGS)"; LDFLAGS="$(BUILD_LDFLAGS)"; \
-	WARN_CFLAGS="$(WARN_CFLAGS)"; \
-	export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS; cd ./fixinc && \
+	WARN_CFLAGS="$(WARN_CFLAGS)"; LIBERTY=`pwd`/"$(BUILD_LIBIBERTY)"; \
+	export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS LIBERTY; \
+	cd ./fixinc && \
 	$(SHELL) $${srcdir}/mkfixinc.sh $(build_canonical) $(target))
 
 .PHONY: install-gcc-tooldir

gcc/configure.in

@@ -1368,6 +1368,9 @@ then
 	    | powerpc*-*-*,powerpc64*-*-*)
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
 	esac
+elif test "x$TARGET_SYSTEM_ROOT" != x; then
+        # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)
+        SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
 fi
 
 # If this is a cross-compiler that does not
@@ -1405,8 +1408,10 @@ then
     BUILD_CC='$(CC_FOR_BUILD)'
     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
 
-    STMP_FIXINC=
-    STMP_FIXPROTO=
+    if test "x$TARGET_SYSTEM_ROOT" = x; then
+	STMP_FIXINC=
+	STMP_FIXPROTO=
+    fi
 fi
 
 # Expand extra_headers to include complete path.

gcc/fixinc/mkfixinc.sh

@@ -119,7 +119,7 @@ fi
 #  OK.  We gotta make the thing.
 #  make and install either the binary or the default script
 
-defs="SHELL=\"$SHELL\" CC=\"$CC\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
+defs="SHELL=\"$SHELL\" CC=\"$CC\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\" LIBERTY=\"$LIBERTY\""
 cmd="$MAKE ${defs} install-bin"
 echo $cmd
 eval $cmd