diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2000-11-09 13:56:53 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2000-11-09 13:56:53 +0000 |
| commit | 6c80a64553f3ebffaf5c44c947b43ecad4e94b34 (patch) | |
| tree | 8304e960ce617b51cfb0c313bc77bb5c0b45832f /gcc | |
| parent | 6a4afa6c801453c372929f67afe216d5253a0606 (diff) | |
| download | gcc-6c80a64553f3ebffaf5c44c947b43ecad4e94b34.zip gcc-6c80a64553f3ebffaf5c44c947b43ecad4e94b34.tar.gz gcc-6c80a64553f3ebffaf5c44c947b43ecad4e94b34.tar.bz2 | |
mklibgcc.in (EXTRA_MULTILIB_PARTS): Prevent `make' from interpreting $out as a macro assignment.
* mklibgcc.in (EXTRA_MULTILIB_PARTS): Prevent `make' from
interpreting $out as a macro assignment.
* Makefile.in (T_TARGET): New auxiliary macro and target.
(all): Add a target right in the beginning, so that we don't build
T_TARGET by default.
From-SVN: r37342
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/Makefile.in | 8 | ||||
| -rw-r--r-- | gcc/mklibgcc.in | 9 |
3 files changed, 23 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7fda910..e63ecbc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2000-11-09 Alexandre Oliva <aoliva@redhat.com> + + * mklibgcc.in (EXTRA_MULTILIB_PARTS): Prevent `make' from + interpreting $out as a macro assignment. + * Makefile.in (T_TARGET): New auxiliary macro and target. + (all): Add a target right in the beginning, so that we don't build + T_TARGET by default. + 2000-11-09 Graham Stott <grahams@redhat.com> * config/i386/i386.md (mmx_pinsrw): Output operands in correct diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 2fefb3f..3b2e8d9 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -24,6 +24,9 @@ # uninstall, TAGS, mostlyclean, clean, distclean, maintainer-clean, # stage1, stage2, stage3, stage4. +# This is the default target. +all: + # Suppress smart makes who think they know how to automake Yacc files .y.c: @@ -562,6 +565,11 @@ CRT0STUFF_T_CFLAGS = # "t" or nothing, for building multilibbed versions of, say, crtbegin.o. T = +# Should T contain a `=', libgcc.mk will make T_TARGET, setting +# $(T_TARGET) to the name of the actual target filename. +T_TARGET = +T_TARGET : $(T_TARGET) + # End of variables for you to override. # Definition of `all' is here so that new rules inserted by sed diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index e9dc22c..1953da47 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -363,13 +363,18 @@ for f in $EXTRA_MULTILIB_PARTS; do flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; case $dir in .) out=$f ; t= ;; - *) out="$dir/$f" ; t=$dir/ ;; + *) out=$dir/$f ; t=$dir/ ;; + esac + case $out in + # Prevent `make' from interpreting $out as a macro assignment + *'$(EQ)'*) targ="T_TARGET=$out T_TARGET" ;; + *) targ=$out ;; esac echo $out: stmp-dirs echo " $make_compile" \\ echo ' LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\ - echo ' MULTILIB_CFLAGS="'$flags'"' T=$t $out + echo ' MULTILIB_CFLAGS="'$flags'"' T=$t $targ all="$all $out" done |