Add a --module-path option so we can make sure we load the correct module during the bootstrap.

Author: jnthn

src/HLL/SerializationContextBuilder.pm

@@ -174,7 +174,8 @@ class HLL::Compiler::SerializationContextBuilder {
     # during the deserialization.
     method load_module($module_name, $cur_GLOBALish) {
         # Immediate loading.
-        ModuleLoader.load_module($module_name, $cur_GLOBALish);
+        ModuleLoader.load_module($module_name, $cur_GLOBALish,
+            :prefix(%*COMPILING<%?OPTIONS><module-path>));
 
         # Make sure we do the loading during deserialization.
         self.add_event(:deserialize_past(PAST::Stmts.new(

src/ModuleLoader.pm

@@ -11,12 +11,15 @@ knowhow ModuleLoader {
         $*CTXSAVE := 0;
     }
 
-    method load_module($module_name, $cur_GLOBALish) {
+    method load_module($module_name, $cur_GLOBALish, :$prefix) {
         # If we didn't already do so, load the module and capture
         # its mainline. Otherwise, we already loaded it so go on
         # with what we already have.
         my $module_ctx;
         my $path := pir::join('/', pir::split('::', $module_name)) ~ '.pbc';
+        if $prefix {
+            $path := "$prefix/$path";
+        }
         if pir::defined(%modules_loaded{$path}) {
             $module_ctx := %modules_loaded{$path};
         }

src/NQP/Compiler.pm

@@ -13,6 +13,7 @@ sub MAIN(@ARGS) {
     @clo.push('parsetrace');
     @clo.push('setting=s');
     @clo.push('setting-path=s');
+    @clo.push('module-path=s');
 
     # Enter the compiler.
     $nqpcomp.command_line(@ARGS, :encoding('utf8'), :transcode('ascii iso-8859-1'));