From 2a70ed792f883b8340099d74b2f325b2ca01616b Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Thu, 22 Oct 2015 21:21:42 +0200 Subject: introduce support for sdkroot and sysroot to support cross-builds To allow building for another location rather the final install prefix, regardless whether chroot based builds, cross-compile or canadian cross sdk is the goal, realize the difference between prefix, the sdk-root and the system root for final target. Signed-off-by: Jens Rehsack --- tools/build/Makefile.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/build') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 7b70874..68e20c6 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -7,6 +7,8 @@ STAR_VERSION = 2015.09 # install location PREFIX_DIR = @prefix@ +SDKROOT_DIR = @sdkroot@ +SYSROOT_DIR = @sysroot@ # JVM install location JVM_BIN_DIR = $(PREFIX_DIR)/bin @@ -40,7 +42,7 @@ rakudo: @backend_exes@ @backend_exes@: @echo "== Configuring and building Rakudo" - cd $(RAKUDO_DIR) && $(PERL) Configure.pl --prefix=$(PREFIX_DIR) --backends=@backends@ && $(MAKE) + cd $(RAKUDO_DIR) && $(PERL) Configure.pl --sysroot=$(SYSROOT_DIR) --sdkroot=$(SDKROOT_DIR) --prefix=$(PREFIX_DIR) --backends=@backends@ && $(MAKE) rakudo-test: rakudo cd $(RAKUDO_DIR) && $(MAKE) test -- cgit v1.1 From 72d52f2982809df3576ef47da604e1656f47a63e Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Sun, 22 Nov 2015 14:43:13 +0100 Subject: tools/build: fix Makefile.in to deal with optional empty arguments or locations with spaces Fixes embedded toolchains are invoked correctly when arguments are empty or contain spaces Signed-off-by: Jens Rehsack --- tools/build/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/build') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 68e20c6..735da6c 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 --sysroot="$(SYSROOT_DIR)" --sdkroot="$(SDKROOT_DIR)" --prefix="$(PREFIX_DIR)" --backends=@backends@ && $(MAKE) rakudo-test: rakudo cd $(RAKUDO_DIR) && $(MAKE) test -- cgit v1.1 From 956d9ef2b0db4e9ad08ca06d081318260ced05de Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Mon, 23 Nov 2015 17:14:39 +0100 Subject: 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 --- tools/build/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/build') 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 -- cgit v1.1