configure.ac: Don't clear STMP_FIXINC or STMP_FIXPROTO just because we don't want...

	* configure.ac: Don't clear STMP_FIXINC or STMP_FIXPROTO just
	because we don't want to run them now; instead, set them to
	stmp-install-fixproto or stmp-install-fixinc.
	* Makefile.in (stmp-install-fixproto): New.
	(stmp-install-fixinc): New.
	* configure: Regenerate.

From-SVN: r89999

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0bb7e282f9797bba6eb9f0e0b33477ffb525f50f..51cf826969409f8346389afd17323fcf4652cbbd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-02  Geoffrey Keating  <geoffk@apple.com>
+
+       * configure.ac: Don't clear STMP_FIXINC or STMP_FIXPROTO just
+       because we don't want to run them now; instead, set them to
+       stmp-install-fixproto or stmp-install-fixinc.
+       * Makefile.in (stmp-install-fixproto): New.
+       (stmp-install-fixinc): New.
+       * configure: Regenerate.
+
 2004-11-02  Nathan Sidwell  <nathan@codesourcery.com>
 
        * flow.c (init_propagate_block_info): Use bitmap_empty_p on result

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8acc3ccdba8673b5583105b87dd502bc4996c5b7..125dee4fec156bd302e06966b01ece4974017fb4 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2829,6 +2829,12 @@ stmp-fixinc: fixinc.sh gsyslimits.h specs.ready
        chmod a+r include/syslimits.h)
        $(STAMP) stmp-fixinc
 
+# We can't run fixinc (it's being built for a different host), but we still
+# need to install it so that the user can run it when the compiler is
+# installed.
+stmp-install-fixinc: fixinc.sh gsyslimits.h
+       $(STAMP) $@
+
 # Files related to the fixproto script.
 # gen-protos and fix-header are compiled with CC_FOR_BUILD, but they are only
 # used in native and host-x-target builds, so it's safe to link them with
@@ -2909,6 +2915,12 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
          $(STAMP) include/fixed; \
        fi
        $(STAMP) stmp-fixproto
+
+# We can't run fixproto (it's being built for a different host), but we still
+# need to install it so that the user can run it when the compiler is
+# installed.
+stmp-install-fixproto: fixproto
+       $(STAMP) $@
 #\f
 # Remake the info files.
 

diff --git a/gcc/configure b/gcc/configure
index 117fb03d8ca33eb7d1e0da955f6aed3326236163..2b71fedfb65ed34860fc8549ccdb37349c795efb 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -12683,15 +12683,17 @@ then
     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
 
     if test "x$TARGET_SYSTEM_ROOT" = x; then
-       STMP_FIXINC=
-       STMP_FIXPROTO=
+       STMP_FIXINC=stmp-install-fixinc
+       if  "x$STMP_FIXPROTO" != x  ; then
+         STMP_FIXPROTO=stmp-install-fixproto
+       fi
     fi
 fi
 
 # When bootstrapping from the toplevel, only run fixincludes during stage1
 if test -d ../prev-gcc
 then
-    STMP_FIXINC=
+    STMP_FIXINC=stmp-install-fixinc
     cp -R ../prev-gcc/include include
 fi
 

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 6f388754da1ca32b159ae60c3808700463e81468..e5be4eefcc5d516fb051768e8fd3c0e78b131714 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1684,15 +1684,17 @@ then
     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
 
     if test "x$TARGET_SYSTEM_ROOT" = x; then
-       STMP_FIXINC=
-       STMP_FIXPROTO=
+       STMP_FIXINC=stmp-install-fixinc
+       if [ "x$STMP_FIXPROTO" != x ] ; then
+         STMP_FIXPROTO=stmp-install-fixproto
+       fi
     fi
 fi
 
 # When bootstrapping from the toplevel, only run fixincludes during stage1
 if test -d ../prev-gcc
 then
-    STMP_FIXINC=
+    STMP_FIXINC=stmp-install-fixinc
     cp -R ../prev-gcc/include include
 fi