diff options
| author | Geoffrey Keating <geoffk@apple.com> | 2004-11-02 21:16:51 +0000 |
|---|---|---|
| committer | Geoffrey Keating <geoffk@gcc.gnu.org> | 2004-11-02 21:16:51 +0000 |
| commit | de253ca48a960dd0d3ce5271c080afa3db69d7c0 (patch) | |
| tree | 31305602cb10fa28129751b17c518d6490193999 | |
| parent | f7569f3a0f8f97141b08bb5c8ac58fcbc7eeccf2 (diff) | |
| download | gcc-de253ca48a960dd0d3ce5271c080afa3db69d7c0.zip gcc-de253ca48a960dd0d3ce5271c080afa3db69d7c0.tar.gz gcc-de253ca48a960dd0d3ce5271c080afa3db69d7c0.tar.bz2 | |
configure.ac: Don't clear STMP_FIXINC or STMP_FIXPROTO just because we don't want to run them...
* 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
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/Makefile.in | 12 | ||||
| -rwxr-xr-x | gcc/configure | 8 | ||||
| -rw-r--r-- | gcc/configure.ac | 8 |
4 files changed, 31 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0bb7e28..51cf8269 100644 --- 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 8acc3cc..125dee4 100644 --- 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) $@ # # Remake the info files. diff --git a/gcc/configure b/gcc/configure index 117fb03..2b71fedf 100755 --- 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 6f38875..e5be4ee 100644 --- 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 |