From 77a605d48ed255d94bbe93ba17d53a2245a22a35 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 18 Feb 2010 20:43:31 +0100
Subject: complibs: simplify config file

Although currently the wrapper is directly dependent on
companion libraries, let's still decorelate those two.
---
 scripts/build/binutils/binutils.sh   | 2 +-
 scripts/build/companion_libs/gmp.sh  | 4 ++--
 scripts/build/companion_libs/mpfr.sh | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index fb653f66..2f4bbbd7 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 2155cb9f..351c2fa1 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 b76161a4..5e91e1ad 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
-- 
cgit v1.2.3