src/tools/shared-misc gen-makefile.in,1.52,1.52.2.1

Update of /var/lib/cvs/src/tools/shared-misc
In directory cantor:/tmp/cvs-serv31382/tools/shared-misc

Modified Files:
      Tag: gd-2-3-newio
        gen-makefile.in 
Log Message:
Build the io and system libraries using the pre-existing melange,
unless we're bootstrapping with mindy anyway.


Index: gen-makefile.in
===================================================================
RCS file: /var/lib/cvs/src/tools/shared-misc/gen-makefile.in,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -u -d -r1.52 -r1.52.2.1
--- gen-makefile.in     22 Oct 2003 20:26:16 -0000      1.52
+++ gen-makefile.in     24 Oct 2003 02:24:52 -0000      1.52.2.1
@@ -511,6 +511,11 @@
             $CFLAGS = $target_platform{'default_c_compiler_flags'};
         }
         $CFLAGS =~ s/-I%s//;
+
+       if($use_previous_melange && $build_tools_with_d2c) {
+           $MELANGE = $PREVIOUS_MELANGE;
+       }
+
         print <<EOF;
 D2C = $D2C
 D2CFLAGS = $D2CFLAGS
@@ -1053,7 +1058,10 @@
        print " \$(SRCDIR)/$header";
     }
     print "\n";
-    printf("\t$host_platform{'recursive_make_command'}\n", $MELANGE_DIR, "");
+    unless($use_previous_melange && $build_tools_with_d2c) {
+       printf("\t$host_platform{'recursive_make_command'}\n",
+              $MELANGE_DIR, "");
+    }
     print "\t\$(MELANGE) --d2c \$(CPPFLAGS) -I\$(SRCDIR) ";
     if($EXTRA_INCLUDE_DIR ne "") {
       print "-I$EXTRA_INCLUDE_DIR ";

_______________________________________________
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
http://www.gwydiondylan.org/mailman/listinfo/gd-chatter