Build stage2 with the --stable-sc option

also extend --stable-sc to accept an identifier which is to be part of the SC hash Can only make stage 1 stable after a bootstrap, I fear
Raku · Oct 8, 2015 · a19dab8 · a19dab8
1 parent a488d59
commit a19dab8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/NQP/Compiler.nqp b/src/NQP/Compiler.nqp
@@ -24,7 +24,7 @@ my @clo := $nqpcomp.commandline_options();
 @clo.push('setting-path=s');
 @clo.push('module-path=s');
 @clo.push('no-regex-lib');
-@clo.push('stable-sc');
+@clo.push('stable-sc=s');
 @clo.push('optimize=s');
 #?if parrot
 @clo.push('vmlibs=s');

diff --git a/src/NQP/Grammar.nqp b/src/NQP/Grammar.nqp
@@ -19,7 +19,7 @@ grammar NQP::Grammar is HLL::Grammar {
         # with this compilation unit.
         my $file := nqp::getlexdyn('$?FILES');
         my $source_id := nqp::sha1(self.target()) ~
-            (%*COMPILING<%?OPTIONS><stable-sc> ?? '' !! '-' ~ ~nqp::time_n());
+            (%*COMPILING<%?OPTIONS><stable-sc> || '-' ~ ~nqp::time_n());
         my $*W := nqp::isnull($file) ??
             NQP::World.new(:handle($source_id)) !!
             NQP::World.new(:handle($source_id), :description($file));

diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
@@ -7,7 +7,7 @@ M_STAGE1 = gen/moar/stage1
 M_STAGE2 = gen/moar/stage2
 
 M_STAGE0_NQP = $(MOAR) --libpath=$(M_STAGE0) $(M_STAGE0)/nqp.moarvm --bootstrap
-M_STAGE1_NQP = $(MOAR) --libpath=$(M_STAGE1) $(M_STAGE1)/nqp.moarvm --bootstrap
+M_STAGE1_NQP = $(MOAR) --libpath=$(M_STAGE1) $(M_STAGE1)/nqp.moarvm --bootstrap --stable-sc=s1
 
 NQP_MO_MOAR     = nqpmo.moarvm