ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-04-23 02:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #143 from jasmin-j/fix_141

Browse Source 
Added new config ISL_V_0_14_or_later and ISL_V_0_12_or_later to select
This commit is contained in:
Bryan Hundven 2015-08-31 22:12:51 -07:00
commit 366255e75c
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/companion_libs/isl.in
View File

@ -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

15
scripts/build/companion_libs/121-isl.sh
View File

@ -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"