diff options
author | Moritz Lenz <moritz@faui2k3.org> | 2015-11-10 18:46:37 +0100 |
---|---|---|
committer | Moritz Lenz <moritz@faui2k3.org> | 2015-11-10 18:46:37 +0100 |
commit | dc1ba76ac09d011b96f9cd698deacfe8328042a5 (patch) | |
tree | ae910cfc290f3e20571416c22d682fd91e3b6f60 /Configure.pl | |
parent | 12d32ac0f8fe657730af27ca908d2137211e5ed5 (diff) | |
parent | f0def6dc7b4f576668e689cfd44745e506a305ad (diff) |
Merge pull request #53 from rehsack/master
add staging dir support for building
Diffstat (limited to 'Configure.pl')
-rw-r--r-- | Configure.pl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Configure.pl b/Configure.pl index 29ee0b8..889da70 100644 --- a/Configure.pl +++ b/Configure.pl @@ -32,6 +32,7 @@ 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!', @@ -59,9 +60,9 @@ MAIN: { } unless (defined $options{prefix}) { - my $dir = getcwd; - print "ATTENTION: no --prefix supplied, building and installing to $dir/install\n"; - $options{prefix} = 'install'; + 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; } $options{prefix} = File::Spec->rel2abs($options{prefix}); @@ -148,6 +149,8 @@ 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'}; @@ -263,6 +266,9 @@ 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] |