diff options
| author | Jeffrey A Law <law@cygnus.com> | 1998-05-18 00:48:07 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-05-17 18:48:07 -0600 |
| commit | 88111b2691b56a8637ae053a4eeb7aec9597180c (patch) | |
| tree | d275653e9b9e2ec33a874a63a7cc80bc533910b2 /gcc | |
| parent | d8af60bf7f50a12ea57d8e4a00e11e81fc5322af (diff) | |
| download | gcc-88111b2691b56a8637ae053a4eeb7aec9597180c.zip gcc-88111b2691b56a8637ae053a4eeb7aec9597180c.tar.gz gcc-88111b2691b56a8637ae053a4eeb7aec9597180c.tar.bz2 | |
Makefile.in (build_canonical, [...]): Let configure substitute values for these variables.
* Makefile.in (build_canonical, host_canonical): Let configure
substitute values for these variables.
* configure.in: Substitute for build_canonical, host_canonical
and target_subdir in generated Makefile.
From-SVN: r19827
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 3 | ||||
| -rwxr-xr-x | gcc/configure | 15 | ||||
| -rw-r--r-- | gcc/configure.in | 12 |
4 files changed, 35 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c96e8c2..94d3c2c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ Mon May 18 01:23:33 1998 Jeffrey A Law (law@cygnus.com) + * Makefile.in (build_canonical, host_canonical): Let configure + substitute values for these variables. + * configure.in: Substitute for build_canonical, host_canonical + and target_subdir in generated Makefile. + * output.h (find_basic_blocks): Declare. (free_basic_block_vars, set_block_num, life_analysis): Likewise. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 88b0202..029ed14 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -170,6 +170,9 @@ ENQUIRE_LDFLAGS = $(LDFLAGS) program_transform_name = @program_transform_name@ program_transform_cross_name = s,^,$(target_alias)-, +build_canonical = @build_canonical@ +host_canonical = @host_canonical@ + # Tools to use when building a cross-compiler. # These are used because `configure' appends `cross-make' # to the makefile when making a cross-compiler. diff --git a/gcc/configure b/gcc/configure index 37b499c..c88ad6e 100755 --- a/gcc/configure +++ b/gcc/configure @@ -5212,6 +5212,18 @@ if [ ! -f Makefile.in ]; then echo "source ${srcdir}/.gdbinit" >> .gdbinit fi +# Define variables host_canonical and build_canonical +# because some Cygnus local changes in the Makefile depend on them. +build_canonical=${build} +host_canonical=${host} +target_subdir= +if [ "${host}" != "${target}" ] ; then + target_subdir=${target}/ +fi + + + + # If this is using newlib, then define inhibit_libc in # LIBGCC2_CFLAGS. This will cause __eprintf to be left out of # libgcc.a, but that's OK because newib should have its own version of @@ -5497,6 +5509,9 @@ s%@doprint@%$doprint%g s%@manext@%$manext%g s%@objext@%$objext%g s%@gthread_flags@%$gthread_flags%g +s%@build_canonical@%$build_canonical%g +s%@host_canonical@%$host_canonical%g +s%@target_subdir@%$target_subdir%g s%@inhibit_libc@%$inhibit_libc%g s%@sched_prefix@%$sched_prefix%g s%@sched_cflags@%$sched_cflags%g diff --git a/gcc/configure.in b/gcc/configure.in index d8bc744..0ee19c4 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -3368,6 +3368,18 @@ if [[ ! -f Makefile.in ]]; then echo "source ${srcdir}/.gdbinit" >> .gdbinit fi +# Define variables host_canonical and build_canonical +# because some Cygnus local changes in the Makefile depend on them. +build_canonical=${build} +host_canonical=${host} +target_subdir= +if [[ "${host}" != "${target}" ]] ; then + target_subdir=${target}/ +fi +AC_SUBST(build_canonical) +AC_SUBST(host_canonical) +AC_SUBST(target_subdir) + # If this is using newlib, then define inhibit_libc in # LIBGCC2_CFLAGS. This will cause __eprintf to be left out of # libgcc.a, but that's OK because newib should have its own version of |