Support for the latest changes in nqp-configure

OpenBSD build and command line options handling improvements.
Raku · May 17, 2019 · 03ded1c · 03ded1c
1 parent 7732ed6
commit 03ded1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/3rdparty/nqp-configure b/3rdparty/nqp-configure
diff --git a/Configure.pl b/Configure.pl
@@ -31,7 +31,7 @@ BEGIN
 
 use lib ( 
     "$FindBin::Bin/tools/lib",
-    "$FindBin::Bin/3rdparty/nqp-configure/lib" 
+    "$FindBin::Bin/3rdparty/nqp-configure/lib",
 );
 use NQP::Config qw<system_or_die>;
 use NQP::Config::NQP;
@@ -60,6 +60,7 @@ BEGIN
         'github-user=s',    'nqp-repo=s',
         'moar-repo=s',      'expand=s',
         'out=s',            'set-var=s@',
+        'no-relocatable',
       )
       or do {
         print_help();

diff --git a/tools/lib/NQP/Config/NQP.pm b/tools/lib/NQP/Config/NQP.pm
@@ -272,27 +272,6 @@ sub gen_moar {
 #`$moar_path --libpath="$libpath" "$nqp_moarvm" -e "print(nqp::backendconfig()<make>)"`;
 }
 
-# Command line options not to be included into configure_opts macro output
-sub ignorable_opt {
-    my $self = shift;
-    my $opt  = shift;
-    return $opt =~ /^
-            (?:
-                gen-
-                | (?:
-                    help
-                    | no-clean
-                    | ignore-errors
-                    | make-install
-                    | expand
-                    | out
-                    | backends
-                  ) 
-                  $
-            )
-        /x;
-}
-
 sub probe_node {
     my $self = shift;