diff -r b488b4815f9b -r e44f67656c5f scripts/build/companion_libs/gmp.sh
--- a/scripts/build/companion_libs/gmp.sh	Thu Feb 18 20:43:31 2010 +0100
+++ b/scripts/build/companion_libs/gmp.sh	Wed Feb 17 23:50:49 2010 +0100
@@ -8,7 +8,7 @@
 do_gmp_target() { :; }
 
 # Overide functions depending on configuration
-if [ "${CT_GMP}" = "y" ]; then
+if [ "${CT_GMP}" = "y" -o "${CT_GMP_TARGET}" = "y" ]; then
 
 # Download GMP
 do_gmp_get() {
@@ -21,6 +21,8 @@
     CT_Patch "gmp-${CT_GMP_VERSION}"
 }
 
+if [ "${CT_GMP}" = "y" ]; then
+
 do_gmp() {
 
     mkdir -p "${CT_BUILD_DIR}/build-gmp"
@@ -56,7 +58,9 @@
     CT_EndStep
 }
 
-if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then
+fi # CT_GMP
+
+if [ "${CT_GMP_TARGET}" = "y" ]; then
 
 do_gmp_target() {
     mkdir -p "${CT_BUILD_DIR}/build-gmp-target"
@@ -87,6 +91,6 @@
     CT_EndStep
 }
 
-fi # CT_COMPLIBS_TARGET == y
+fi # CT_GMP_TARGET
 
-fi # CT_GMP == y
+fi # CT_GMP || CT_GMP_TARGET