diff options
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/NQP/Configure.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/lib/NQP/Configure.pm b/tools/lib/NQP/Configure.pm index 2f67bf1..664f63f 100644 --- a/tools/lib/NQP/Configure.pm +++ b/tools/lib/NQP/Configure.pm @@ -3,7 +3,6 @@ use strict; use warnings; use Cwd; use File::Copy qw(copy); -use File::Spec qw(); use base qw(Exporter); our @EXPORT_OK = qw(sorry slurp system_or_die @@ -218,7 +217,6 @@ sub gen_nqp { my $gen_nqp = $options{'gen-nqp'}; my $gen_moar = $options{'gen-moar'}; my $prefix = $options{'prefix'} || cwd().'/install'; - my $sdkroot = $options{'sdkroot'} || ''; my $startdir = cwd(); my $PARROT_REVISION = 'nqp/tools/build/PARROT_REVISION'; @@ -229,7 +227,7 @@ sub gen_nqp { for my $b (qw/jvm moar/) { if ($backends =~ /$b/) { my $postfix = substr $b, 0, 1; - my $bin = File::Spec->catfile( $sdkroot, $prefix, 'bin', "nqp-$postfix$bat" ); + my $bin = "$prefix/bin/nqp-$postfix$bat"; $impls{$b}{bin} = $bin; my %c = read_config($bin); my $nqp_have = $c{'nqp::version'} || ''; @@ -282,13 +280,12 @@ sub gen_moar { my %options = @_; my $prefix = $options{'prefix'} || cwd()."/install"; - my $sdkroot = $options{'sdkroot'} || ''; my $gen_moar = $options{'gen-moar'}; my @opts = @{ $options{'moar-option'} || [] }; push @opts, "--optimize"; my $startdir = cwd(); - my $moar_exe = File::Spec->catfile( $sdkroot, $prefix, 'bin', "moar$exe" ); + my $moar_exe = "$prefix/bin/moar$exe"; my $moar_have = -e $moar_exe ? qx{ $moar_exe --version } : undef; if ($moar_have) { $moar_have = $moar_have =~ /version (\S+)/ ? $1 : undef; |