diff options
author | Alexey Neyman <stilor@att.net> | 2017-03-11 21:04:13 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-11 21:04:13 (GMT) |
commit | 8f4db915bdb7b17a636d5ba7678bdb9c6c634cc0 (patch) | |
tree | 65afe485107ee62a9602730e62c6fcd8792e3321 /scripts/build/companion_tools/050-make.sh | |
parent | af2c6c601bd8c9e29cda2eb068f59d69937c742c (diff) | |
parent | dd55349646fee71a04c66d51f647edd201f835aa (diff) |
Merge pull request #640 from stilor/make-no-guile-canadian
Disable Guile in make if building for host in canadian
Diffstat (limited to 'scripts/build/companion_tools/050-make.sh')
-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 |