diff -r 35cf5e2f110a -r af092b4bf65c scripts/build/companion_libs/libelf.sh
--- a/scripts/build/companion_libs/libelf.sh	Wed Feb 17 23:41:17 2010 +0100
+++ b/scripts/build/companion_libs/libelf.sh	Sun Apr 11 00:47:23 2010 +0200
@@ -24,12 +24,21 @@
 # Uncomment when we need it for gcc-4.5
 # WARNING! This function is absolutely UNTESTED yet!
 do_libelf() {
-    : # Remove this line!
+    : # Remove this line! and uncomment the following lines
+#    local -a libelf_opts
+#
 #    CT_DoStep INFO "Installing libelf"
 #    mkdir -p "${CT_BUILD_DIR}/build-libelf"
 #    CT_Pushd "${CT_BUILD_DIR}/build-libelf"
 #
 #    CT_DoLog EXTRA "Configuring libelf"
+#
+#    if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then
+#        libelf_opts+=( --enable-shared --disable-static )
+#    else
+#        libelf_opts+=( --disable-shared --enable-static )
+#    fi
+#
 #    CC="${CT_TARGET}-gcc"                                   \
 #    CT_DoExecLog ALL                                        \
 #    "${CT_SRC_DIR}/libelf-${CT_LIBELF_VERSION}/configure"   \
@@ -39,9 +48,8 @@
 #        --prefix="${CT_PREFIX_DIR}"                         \
 #        --enable-compat                                     \
 #        --enable-elf64                                      \
-#        --enable-static                                     \
-#        --enable-shared                                     \
-#        --enable-extended-format
+#        --enable-extended-format                            \
+#        "${libelf_opts[@]}"
 #
 #    CT_DoLog EXTRA "Building libelf"
 #    CT_DoExecLog ALL make