This is the mail archive of the gcc-bugs@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: Make madness on irix6.5


On Nov  9, 2000, "Billinghurst, David (CRTS)" <David.Billinghurst@riotinto.com> wrote:

> Doesn't seem to work.

I see.  Here's take two:

Index: gcc/ChangeLog
from  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.

Index: gcc/mklibgcc.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/mklibgcc.in,v
retrieving revision 1.22
diff -u -p -r1.22 mklibgcc.in
--- gcc/mklibgcc.in 2000/11/08 03:51:34 1.22
+++ gcc/mklibgcc.in 2000/11/09 06:46:16
@@ -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
Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/Makefile.in,v
retrieving revision 1.535
diff -u -p -r1.535 Makefile.in
--- gcc/Makefile.in 2000/11/05 10:35:30 1.535
+++ gcc/Makefile.in 2000/11/09 06:46:17
@@ -562,6 +562,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

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist    *Please* write to mailing lists, not to me

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]