aboutsummaryrefslogtreecommitdiff
path: root/Configure.pl
diff options
context:
space:
mode:
authorMoritz Lenz <moritz@faui2k3.org>2015-11-22 12:33:05 +0000
committerMoritz Lenz <moritz@faui2k3.org>2015-11-22 12:33:05 +0000
commit60378f2972f175710d33615a51ba51bc59a344ff (patch)
treed6ad0694cdb16610bce030e5be56c483752a88aa /Configure.pl
parent76e441fb40bb006f32b379f7b2cbc7c8cb15ade8 (diff)
Revert "introduce support for sdkroot and sysroot to support cross-builds"
This reverts commit f0def6dc7b4f576668e689cfd44745e506a305ad. See https://github.com/rakudo/star/pull/53#issuecomment-158754696 for the reason.
Diffstat (limited to 'Configure.pl')
-rw-r--r--Configure.pl12
1 files changed, 3 insertions, 9 deletions
diff --git a/Configure.pl b/Configure.pl
index 889da70..29ee0b8 100644
--- a/Configure.pl
+++ b/Configure.pl
@@ -32,7 +32,6 @@ MAIN: {
my %options;
GetOptions(\%options, 'help!', 'prefix=s',
- 'sysroot=s', 'sdkroot=s',
'backends=s', 'no-clean!',
'gen-nqp:s', 'gen-moar:s',
'make-install!', 'makefile-timing!',
@@ -60,9 +59,9 @@ MAIN: {
}
unless (defined $options{prefix}) {
- my $default = defined($options{sysroot}) ? '/usr' : File::Spec->catdir(getcwd, 'install');
- print "ATTENTION: no --prefix supplied, building and installing to $default\n";
- $options{prefix} = $default;
+ my $dir = getcwd;
+ print "ATTENTION: no --prefix supplied, building and installing to $dir/install\n";
+ $options{prefix} = 'install';
}
$options{prefix} = File::Spec->rel2abs($options{prefix});
@@ -149,8 +148,6 @@ MAIN: {
}
$config{prefix} = $prefix;
- $config{sdkroot} = $options{sdkroot};
- $config{sysroot} = $options{sysroot};
$config{slash} = $slash;
$config{'makefile-timing'} = $options{'makefile-timing'};
$config{'stagestats'} = '--stagestats' if $options{'makefile-timing'};
@@ -266,9 +263,6 @@ Configure.pl - $lang Configure
General Options:
--help Show this text
--prefix=dir Install files in dir; also look for executables there
- --sdkroot=dir When given, use for searching build tools here, e.g.
- nqp, java etc.
- --sysroot=dir When given, use for searching runtime components here
--backends=jvm,moar
Which backend(s) to use
--gen-moar[=branch]