fundev Makefile.in, 1.1, 1.1.2.1 configure.ac, 1.2, 1.2.2.1

Update of /var/lib/cvs/fundev
In directory cantor:/tmp/cvs-serv4758

Modified Files:
      Tag: fundev-2-1-jam
        Makefile.in configure.ac 
Log Message:
Bug: 7003
Use fdmake for the phase 1 bootstrap too.


Index: Makefile.in
===================================================================
RCS file: /var/lib/cvs/fundev/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- Makefile.in 18 Mar 2004 08:25:32 -0000      1.1
+++ Makefile.in 29 Jun 2004 20:24:27 -0000      1.1.2.1
@@ -21,18 +21,20 @@
 
 2-stage-bootstrap: stage-1-bootstrap
        FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.1 \
-         $(MAKE) 
FDCOMPILE=$(abs_builddir)/Bootstrap.1/bin/minimal-console-compiler 
final-bootstrap
+         $(MAKE) 
FDCOMPILE="$(abs_builddir)/Bootstrap.1/bin/minimal-console-compiler -build 
-save" final-bootstrap
 
 3-stage-bootstrap: stage-1-bootstrap stage-2-bootstrap
        FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.2 \
-         $(MAKE) 
FDCOMPILE=$(abs_builddir)/Bootstrap.2/bin/minimal-console-compiler 
final-bootstrap
+         $(MAKE) 
FDCOMPILE="$(abs_builddir)/Bootstrap.2/bin/minimal-console-compiler -build 
-save" final-bootstrap
 
 4-stage-bootstrap: stage-1-bootstrap stage-2-bootstrap stage-3-bootstrap
        FUNCTIONAL_DEVELOPER_RELEASE_ROOT=$(abs_builddir)/Bootstrap.3 \
-         $(MAKE) 
FDCOMPILE=$(abs_builddir)/Bootstrap.3/bin/minimal-console-compiler 
final-bootstrap
+         $(MAKE) 
FDCOMPILE="$(abs_builddir)/Bootstrap.3/bin/minimal-console-compiler -build 
-save" final-bootstrap
 
 stage-1-bootstrap: \
-               Bootstrap.1 $(srcdir)/Sources/bootstrap1-registry \
+               Bootstrap.1 \
+               Bootstrap.1/lib/$(fd_build)-build.jam \
+               $(srcdir)/Sources/bootstrap1-registry \
                Bootstrap.1/bin/minimal-console-compiler
 
 Bootstrap.1:
@@ -40,6 +42,11 @@
        mkdir Bootstrap.1/Build 
        mkdir Bootstrap.1/logs
        mkdir Bootstrap.1/bin
+       mkdir Bootstrap.1/lib
+
+Bootstrap.1/lib/$(fd_build)-build.jam: Bootstrap.1 
$(srcdir)/Sources/lib/run-time/pentium-linux/$(fd_build)-build.jam
+       cp $(srcdir)/Sources/lib/run-time/pentium-linux/$(fd_build)-build.jam \
+          Bootstrap.1/lib/$(fd_build)-build.jam
 
 BOOTSTRAP1_REGISTRY = $(srcdir)/Sources/bootstrap1-registry
 BOOTSTRAP1_LIBS = \
@@ -80,7 +87,7 @@
          FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(BOOTSTRAP1_REGISTRY) \
          FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/Sources \
          FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.1/Build \
-         $(FDCOMPILE) 
$(abs_srcdir)/Sources/environment/console/minimal-console-compiler.lid 
>Bootstrap.1/logs/compile-minimal-console-compiler.txt
+         $(fdmake) --compiler="$(FDCOMPILE)" minimal-console-compiler
 
 stage-2-bootstrap: Bootstrap.2 Bootstrap.2/bin/minimal-console-compiler
 
@@ -104,7 +111,7 @@
          FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(abs_srcdir)/Sources/registry \
          FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/Sources \
          FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.2/Build \
-         $(fdmake) --compiler=Bootstrap.1/bin/minimal-console-compiler \
+         $(fdmake) --compiler="Bootstrap.1/bin/minimal-console-compiler -build 
-save" \
                    minimal-console-compiler
 
 stage-3-bootstrap: Bootstrap.3 Bootstrap.3/bin/minimal-console-compiler
@@ -129,7 +136,7 @@
          FUNCTIONAL_DEVELOPER_USER_REGISTRIES=$(abs_srcdir)/Sources/registry \
          FUNCTIONAL_DEVELOPER_USER_SOURCES=$(abs_srcdir)/Sources \
          FUNCTIONAL_DEVELOPER_USER_BUILD=$(abs_builddir)/Bootstrap.3/Build \
-         $(fdmake) --compiler=Bootstrap.2/bin/minimal-console-compiler \
+         $(fdmake) --compiler="Bootstrap.2/bin/minimal-console-compiler -build 
-save" \
                    minimal-console-compiler
 
 Bootstrap.final:
@@ -157,7 +164,7 @@
        @echo Building final stage bootstrap...
        FUNCTIONAL_DEVELOPER_USER_INSTALL=$(abs_builddir)/Bootstrap.final \
          $(MAKE) -C $(abs_srcdir)/Sources/lib/run-time/pentium-linux install
-       @$(FINAL_ENV) $(fdmake) --compiler=$(FDCOMPILE) \
+       @$(FINAL_ENV) $(fdmake) --compiler="$(FDCOMPILE)" \
                $(FINAL_LIBRARIES) --library-packs="$(LIBRARY_PACKS)"
 
 install: all

Index: configure.ac
===================================================================
RCS file: /var/lib/cvs/fundev/configure.ac,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- configure.ac        19 Mar 2004 06:37:02 -0000      1.2
+++ configure.ac        29 Jun 2004 20:24:27 -0000      1.2.2.1
@@ -41,6 +41,7 @@
 AC_PATH_PROG(FDCOMPILE, fdcompile, no)
 test "$FDCOMPILE" = no && AC_MSG_ERROR([
 fdcompile is required to bootstrap Functional Devleloper])
+FDCOMPILE=$FDCOMPILE -save
 AC_SUBST(FDCOMPILE)
 
 # TODO: figure out the bootstrap type given the fdcompile version


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