diff options
| author |   Jasmin Jessich <jasmin@anw.at> | 2015-08-29 10:40:46 (GMT) |
|---|---|---|
| committer | Jasmin Jessich <jasmin@anw.at> | 2015-09-01 00:18:35 (GMT) |
| commit | 25dc2d44703ff24e512102a43731ffd5f4723d71 (patch) | |
| tree | b70b43818127d06c5843d787ba951163fe0827b7 | |
| parent | 094b5be8fd9b8a99636b802430eb4ae2edc37710 (diff) | |
Added new config ISL_V_0_14_or_later and ISL_V_0_12_or_later to select
proper configure options for isl 0.14.x and 0.12.x in 121-isl.sh.
Signed-off-by: Jasmin Jessich <jasmin@anw.at>
| -rw-r--r-- | config/companion_libs/isl.in | 9 | ||||
| -rw-r--r-- | scripts/build/companion_libs/121-isl.sh | 15 |
2 files changed, 20 insertions, 4 deletions
diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in index 93babe7..443f872 100644 --- a/config/companion_libs/isl.in +++ b/config/companion_libs/isl.in @@ -9,10 +9,12 @@ choice config ISL_V_0_14 bool prompt "0.14" + select ISL_V_0_14_or_later config ISL_V_0_12_2 bool prompt "0.12.2" + select ISL_V_0_12_or_later config ISL_V_0_11_1 bool @@ -21,6 +23,13 @@ config ISL_V_0_11_1 endchoice +config ISL_V_0_14_or_later + bool + select ISL_V_0_12_or_later + +config ISL_V_0_12_or_later + bool + config ISL_VERSION string # Don't remove next line diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index 6c06ab0..5a623e1 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -87,6 +87,7 @@ do_isl_backend() { local cflags local cxxflags local ldflags + local -a extra_config local arg for arg in "$@"; do @@ -95,6 +96,15 @@ do_isl_backend() { CT_DoLog EXTRA "Configuring ISL" + if [ "${CT_ISL_V_0_12_or_later}" != "y" ]; then + extra_config+=("--with-libgmp-prefix=${prefix}") + extra_config+=("--with-libgmpxx-prefix=${prefix}") + fi + + if [ "${CT_ISL_V_0_14_or_later}" != "y" ]; then + extra_config+=("--with-piplib=no") + fi + CT_DoExecLog CFG \ CFLAGS="${cflags}" \ CXXFLAGS="${cxxflags}" \ @@ -103,14 +113,11 @@ do_isl_backend() { --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ - --with-libgmp-prefix="${prefix}" \ - --with-libgmpxx-prefix="${prefix}" \ - --with-gmp-prefix="${prefix}" \ + "${extra_config[@]}" \ --disable-shared \ --enable-static \ --with-gmp=system \ --with-gmp-prefix="${prefix}" \ - --with-piplib=no \ --with-clang=no CT_DoLog EXTRA "Building ISL" |