diff -r 730e2d63296b -r 0ca0f85a4b2a scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Sun Mar 20 00:02:21 2011 +0100
+++ b/scripts/crosstool-NG.sh.in	Wed Apr 06 22:30:57 2011 +0200
@@ -158,14 +158,7 @@
 CT_BUILDTOOLS_PREFIX_DIR="${CT_WORK_DIR}/${CT_TARGET}/buildtools"
 CT_STATE_DIR="${CT_WORK_DIR}/${CT_TARGET}/state"
 CT_CONFIG_DIR="${CT_BUILD_DIR}/configs"
-if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then
-    CT_COMPLIBS_DIR="${CT_PREFIX_DIR}"
-    # Set LD_LIBRARY_PATH to point to prefix/lib so we can find our own
-    # libraries; add as first path, so we get hit first by the dynamic linker
-    CT_SetLibPath "${CT_COMPLIBS_DIR}/lib" first
-else
-    CT_COMPLIBS_DIR="${CT_BUILD_DIR}/static"
-fi
+CT_COMPLIBS_DIR="${CT_BUILD_DIR}/static"
 
 # Compute test suite install directory
 CT_TEST_SUITE_DIR=${CT_INSTALL_DIR}/test-suite