Merge pull request #1437 from housel/dylan-tool-fdmake-build

dylan-tool fdmake build

Author: housel

Makefile.in

@@ -190,6 +190,8 @@ BOOTSTRAP_3_ROOT = $(abs_builddir)/Bootstrap.3
 
 BOOTSTRAP_3_LIBRARIES = \
 	dylan-compiler dylan-environment parser-compiler dswank make-dylan-app
+BOOTSTRAP_3_STATICS = \
+	dylan-tool
 
 BOOTSTRAP_3_COMPILER = \
         $(BOOTSTRAP_2_ROOT)/bin/dylan-compiler \
@@ -204,6 +206,7 @@ BOOTSTRAP_3_ENV = \
 
 bootstrap-stage-3: bootstrap-stage-3-dirs \
                    bootstrap-stage-3-libraries \
+                   bootstrap-stage-3-statics \
                    bootstrap-stage-3-runtime \
                    bootstrap-stage-3-jamfiles
 
@@ -215,6 +218,11 @@ bootstrap-stage-3-libraries:
 	@$(BOOTSTRAP_3_ENV) $(FDMAKE) --compiler "$(BOOTSTRAP_3_COMPILER)" \
           $(BOOTSTRAP_3_LIBRARIES)
 
+bootstrap-stage-3-statics:
+	@echo Building Open Dylan unified executables...
+	@$(BOOTSTRAP_3_ENV) $(FDMAKE) --compiler "$(BOOTSTRAP_3_COMPILER)" \
+          --unify $(BOOTSTRAP_3_STATICS)
+
 BOOTSTRAP_3_LLVM_RTGVARSyes = \
         OPEN_DYLAN_LLVM_RUNTIME_GENERATOR=$(BOOTSTRAP_3_ROOT)/bin/$(RTG)
 BOOTSTRAP_3_RTGVARS = $(BOOTSTRAP_3_LLVM_RTGVARS@SUPPORT_LLVM@)
@@ -328,10 +336,6 @@ version = @VERSION@
 
 dist: 3-stage-bootstrap
 	mkdir -p release/opendylan-$(version)/bin
-
-	DYLAN=$$(realpath release/opendylan-$(version)) \
-	  make -C sources/app/dylan-tool test && \
-	  make -C sources/app/dylan-tool install
 	mkdir -p release/opendylan-$(version)/databases
 	mkdir -p release/opendylan-$(version)/include/opendylan
 	mkdir -p release/opendylan-$(version)/lib
@@ -343,6 +347,8 @@ dist: 3-stage-bootstrap
 	find release/opendylan-$(version)/sources -depth -name '.*' -exec rm -rf {} \;
 	rm -rf release/opendylan-$(version)/sources/bootstrap1-registry
 	cp -R Bootstrap.3/bin release/opendylan-$(version)/
+	cp -R Bootstrap.3/sbin/* release/opendylan-$(version)/bin
+	ln -s dylan-tool release/opendylan-$(version)/bin/dylan
 	cp -R Bootstrap.3/databases release/opendylan-$(version)/
 	-cp -R Bootstrap.3/include/opendylan release/opendylan-$(version)/include
 	cp -R Bootstrap.3/lib release/opendylan-$(version)/

build/fdmake.pl

@@ -20,11 +20,13 @@
 my $debugger;
 my $gdb;
 my $lldb;
+my $unify;
 my $compiler = 'dylan-compiler';
 &GetOptions('verbose' => \$verbose,
             'debugger' => \$debugger,
             'gdb' => \$gdb,
             'lldb' => \$lldb,
+            'unify'=> \$unify,
             'compiler=s' => \$compiler);
 
 # Names of libraries we already built successfully.
@@ -153,6 +155,9 @@ sub build_library {
     }
 
     my $command = $compiler;
+    if ($unify) {
+        $command .= " -unify";
+    }
     if ($debugger) {
         $command .= " -debugger";
     } 
@@ -300,12 +305,25 @@ sub library_products {
     else {
         my $so = ($platform_name =~ /-darwin$/) ? 'dylib' : 'so';
         $executable = lc($executable);
-        push(@products,
-             File::Spec->catfile($user_root, 'lib', "lib${executable}.${so}"));
+        if ($unify) {
+            push(@products,
+                 File::Spec->catfile($user_root, 'lib', "lib${executable},unify.a"));
+        }
+        else {
+            push(@products,
+                 File::Spec->catfile($user_root, 'lib', "lib${executable}.${so}"));
+        }
 
         if (!defined $header->{'target-type'}
             || lc($header->{'target-type'}) eq 'executable') {
-            push @products, File::Spec->catfile($user_root, 'bin', $executable);
+            if ($unify) {
+                push @products, File::Spec->catfile($user_root, 'sbin',
+                                                    $executable);
+            }
+            else {
+                push @products, File::Spec->catfile($user_root, 'bin',
+                                                    $executable);
+            }
         }
     }