summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-02-18 19:43:31 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-02-18 19:43:31 (GMT)
commit77a605d48ed255d94bbe93ba17d53a2245a22a35 (patch)
tree5d21e7ac25722ef2593014c40f97bb58db2eae25 /scripts/build
parent3eaa187de56bff5ee342ffc8b3feeca7ac2a2c62 (diff)
complibs: simplify config file
Although currently the wrapper is directly dependent on companion libraries, let's still decorelate those two.
Diffstat (limited to 'scripts/build')
-rw-r--r--scripts/build/binutils/binutils.sh2
-rw-r--r--scripts/build/companion_libs/gmp.sh4
-rw-r--r--scripts/build/companion_libs/mpfr.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index fb653f6..2f4bbbd 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -84,7 +84,7 @@ do_binutils_target() {
done
# If GMP and MPFR were configured, then use that
- if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
+ if [ "${CT_BINUTILS_TARGET_USE_GMP_MPFR}" = "y" ]; then
extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr")
extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr")
fi
diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh
index 2155cb9..351c2fa 100644
--- a/scripts/build/companion_libs/gmp.sh
+++ b/scripts/build/companion_libs/gmp.sh
@@ -56,7 +56,7 @@ do_gmp() {
CT_EndStep
}
-if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
+if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then
do_gmp_target() {
mkdir -p "${CT_BUILD_DIR}/build-gmp-target"
@@ -87,6 +87,6 @@ do_gmp_target() {
CT_EndStep
}
-fi # CT_COMP_LIBS_TARGET == y
+fi # CT_COMPLIBS_TARGET == y
fi # CT_GMP == y
diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh
index b76161a..5e91e1a 100644
--- a/scripts/build/companion_libs/mpfr.sh
+++ b/scripts/build/companion_libs/mpfr.sh
@@ -106,7 +106,7 @@ do_mpfr() {
CT_EndStep
}
-if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
+if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then
do_mpfr_target() {
mkdir -p "${CT_BUILD_DIR}/build-mpfr-target"
@@ -145,6 +145,6 @@ do_mpfr_target() {
CT_EndStep
}
-fi # CT_COMP_LIBS_TARGET == y
+fi # CT_COMPLIBS_TARGET == y
fi # CT_MPFR == y