diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-03-10 19:59:52 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-03-10 19:59:52 (GMT) |
| commit | dd55349646fee71a04c66d51f647edd201f835aa (patch) | |
| tree | 0f4d132c5700d002832bc1a8f2c78659107821d5 /scripts | |
| parent | 6f226b5efecc8f15f1adc56be2fa41377523d3a5 (diff) | |
Disable Guile in make if building for host in canadian
make's configure uses pkg-config to detect if Guile should be enabled;
on ArchLinux, this picks up Guile from build machine's pkgconfig and then
it fails to compile.
A better solution might be to create a ${CT_HOST}-pkg-config in
buildtools/bin that would report "unsupported" for all packages.
However a quick grep only showed pkg-config being used by GCJ
(not sure if it will build in canadian cross - we don't have any
samples with GCJ) and Blackfin simulator in GDB (Blackfin is not
currently supported by crosstool-ng). Hence, leave such pkg-config
implementation and testing for another day.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_tools/050-make.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 44487c1..76b24aa 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -46,11 +46,16 @@ do_make_backend() { local prefix local cflags local ldflags + local -a extra_config for arg in "$@"; do eval "${arg// /\\ }" done + if [ "${host}" != "${CT_BUILD}" ]; then + extra_config+=( --without-guile ) + fi + CT_DoLog EXTRA "Configuring make" CT_DoExecLog CFG \ CFLAGS="${cflags}" \ @@ -58,7 +63,8 @@ do_make_backend() { ${CONFIG_SHELL} \ "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \ --host="${host}" \ - --prefix="${prefix}" + --prefix="${prefix}" \ + "${extra_config[@]}" CT_DoLog EXTRA "Building make" CT_DoExecLog ALL make |