diff options
| author | Jens Rehsack <sno@netbsd.org> | 2015-11-23 17:14:39 +0100 |
|---|---|---|
| committer | Jens Rehsack <sno@netbsd.org> | 2015-11-24 20:06:35 +0100 |
| commit | 956d9ef2b0db4e9ad08ca06d081318260ced05de (patch) | |
| tree | e17499fc9a380824eea8b2e5f0c8fd8202e73653 | |
| parent | 72d52f2982809df3576ef47da604e1656f47a63e (diff) | |
tools/build: pass extra arguments to rakudo only when necessary
Don't pass unspecified configure parameters (namely --sdkroot and --sysroot)
to avoid configure errors in rakudo.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
| -rw-r--r-- | Configure.pl | 3 | ||||
| -rw-r--r-- | tools/build/Makefile.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Configure.pl b/Configure.pl index 889da70..f2a7047 100644 --- a/Configure.pl +++ b/Configure.pl @@ -151,6 +151,9 @@ MAIN: { $config{prefix} = $prefix; $config{sdkroot} = $options{sdkroot}; $config{sysroot} = $options{sysroot}; + $config{pass_rakudo_config} = ""; + $config{pass_rakudo_config} .= $options{sdkroot} ? " --sdkroot=\"\$(SDKROOT_DIR)\"" : ""; + $config{pass_rakudo_config} .= $options{sysroot} ? " --sysroot=\"\$(SYSROOT_DIR)\"" : ""; $config{slash} = $slash; $config{'makefile-timing'} = $options{'makefile-timing'}; $config{'stagestats'} = '--stagestats' if $options{'makefile-timing'}; diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 735da6c..bf926f7 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -42,7 +42,7 @@ rakudo: @backend_exes@ @backend_exes@: @echo "== Configuring and building Rakudo" - cd $(RAKUDO_DIR) && $(PERL) Configure.pl --sysroot="$(SYSROOT_DIR)" --sdkroot="$(SDKROOT_DIR)" --prefix="$(PREFIX_DIR)" --backends=@backends@ && $(MAKE) + cd $(RAKUDO_DIR) && $(PERL) Configure.pl@pass_rakudo_config@ --prefix="$(PREFIX_DIR)" --backends=@backends@ && $(MAKE) rakudo-test: rakudo cd $(RAKUDO_DIR) && $(MAKE) test |