From 25dc2d44703ff24e512102a43731ffd5f4723d71 Mon Sep 17 00:00:00 2001 From: Jasmin Jessich Date: Sat, 29 Aug 2015 12:40:46 +0200 Subject: 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 --- scripts/build/companion_libs/121-isl.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index 6c06ab0e..5a623e11 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" -- cgit v1.2.3