summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/companion_libs.in6
-rw-r--r--config/toolchain.in1
-rw-r--r--scripts/build/internals.sh3
3 files changed, 8 insertions, 2 deletions
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 9b059f0..e543faa 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -4,9 +4,14 @@
menu "Companion libraries"
+config WRAPPER_NEEDED
+ bool
+ default n
+
config GMP_MPFR
bool
prompt "GMP and MPFR"
+ select WRAPPER_NEEDED
help
gcc 4.3.0 and above requires both GMP and MPFR to build some frontends,
and some other components can use them as well.
@@ -28,6 +33,7 @@ endif
config PPL_CLOOG_MPC
bool
prompt "PPL, GLooG/PPL and MPC"
+ select WRAPPER_NEEDED
help
gcc-4.4.0 and above requires PPL and CLooG/PPL to build some parts
of the optimiser (GRAPHITE loop optimisation, to be precise).
diff --git a/config/toolchain.in b/config/toolchain.in
index 0aae112..14db552 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -305,6 +305,7 @@ comment "Host specifics"
choice
bool
prompt "| Install tools wrapper as:"
+ depends on WRAPPER_NEEDED
default TOOLS_WRAPPER_SHELL
config TOOLS_WRAPPER_SCRIPT
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index cf869a1..7837f00 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -41,8 +41,7 @@ do_finish() {
# If using the companion libraries, we need a wrapper
# that will set LD_LIBRARY_PATH approriately
- if [ "${CT_GMP_MPFR}" = "y" \
- -o "${CT_PPL_CLOOG_MPC}" = "y" ]; then
+ if [ "${CT_WRAPPER_NEEDED}" = "y" ]; then
CT_DoLog EXTRA "Installing toolchain wrappers"
CT_Pushd "${CT_PREFIX_DIR}/bin"