diff -r 0dce3a3986a1 -r 2542421e3321 scripts/build/internals.sh
--- a/scripts/build/internals.sh	Sun Aug 30 00:27:12 2009 +0200
+++ b/scripts/build/internals.sh	Sun Aug 30 00:57:40 2009 +0200
@@ -41,8 +41,7 @@
 
     # 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"