diff --git a/3rdparty/nqp-configure b/3rdparty/nqp-configure index ef6e25ec92..513b9bc4b8 160000 --- a/3rdparty/nqp-configure +++ b/3rdparty/nqp-configure @@ -1 +1 @@ -Subproject commit ef6e25ec92cdd7ba7f98d174e78e60d375ef2406 +Subproject commit 513b9bc4b8a0d25658479e586413f1caa3a5bf62 diff --git a/Configure.pl b/Configure.pl index 9b2a44940b..85d21600ed 100755 --- 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; 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 index 9da1eb8c27..8853300132 100644 --- 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())"`; } -# 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;