Pass --execname to nqp thus nqp::execname() works (#479)

Only for MoarVM backend, now `nqp::execname()` give out the execution path as defined.
Raku · Jul 11, 2018 · 2e053da · 2e053da
1 parent 668be5c
commit 2e053da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tools/build/gen-moar-runner.pl b/tools/build/gen-moar-runner.pl
@@ -9,10 +9,10 @@
 my ($moar) = @ARGV;
 
 if ($^O eq 'MSWin32') {
-    my $install_to = 'nqp-m.bat';    
+    my $install_to = 'nqp-m.bat';
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
-    print $fh '@ "' . $moar . '" nqp.moarvm %*' . "\n";
+    print $fh '@ "' . $moar . '" --execname="%%\~dpf0" nqp.moarvm %*' . "\n";
     close $fh
         or die "Could not close $install_to: $!";
 }
@@ -22,7 +22,7 @@
         or die "Could not open $install_to: $!";
     printf $fh <<'EOS', $moar;
 #!/bin/sh
-exec %s nqp.moarvm "$@"
+exec %s --execname="$0" nqp.moarvm "$@"
 EOS
     close $fh
         or die "Could not close $install_to: $!";

diff --git a/tools/build/install-moar-runner.pl b/tools/build/install-moar-runner.pl
@@ -19,7 +19,7 @@
     my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-m.bat');
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
-    print $fh '@ "' . $moar . '" --libpath="' . $lib_dir . '" "' . $nqp_mvm . '" %*' . "\n";
+    print $fh '@ "' . $moar . '" --execname="%%\~dpf0" --libpath="' . $lib_dir . '" "' . $nqp_mvm . '" %*' . "\n";
     close $fh
         or die "Could not close $install_to: $!";
 }
@@ -28,7 +28,7 @@
     open my $fh, ">", $install_to
         or die "Could not open $install_to: $!";
     print $fh "#!/bin/sh\n";
-    print $fh "exec $moar --libpath=$lib_dir $nqp_mvm \"\$\@\"\n";
+    print $fh "exec $moar --execname=\"\$0\" --libpath=$lib_dir $nqp_mvm \"\$\@\"\n";
     close $fh
         or die "Could not close $install_to: $!";
     chmod 0755, $install_to;