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
This commit is contained in:
Geoffrey Keating 2004-11-02 21:16:51 +00:00 committed by Geoffrey Keating
parent f7569f3a0f
commit de253ca48a
4 changed files with 31 additions and 6 deletions

View File

@ -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

View File

@ -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.

8
gcc/configure vendored
View File

@ -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

View File

@ -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