Sysroots: Remove a hack that adds gcc 4.6 to ld.so.conf

build/linux/sysroot_scripts/sysroot-creator.sh

Index: build/linux/sysroot_scripts/sysroot-creator.sh
diff --git a/build/linux/sysroot_scripts/sysroot-creator.sh b/build/linux/sysroot_scripts/sysroot-creator.sh
index 567cc2dd2042ab3e4b05d662b4e5d6f55da968bb..288650169f42421f36b3e949e174876cc3977840 100644
--- a/build/linux/sysroot_scripts/sysroot-creator.sh
+++ b/build/linux/sysroot_scripts/sysroot-creator.sh
@@ -293,11 +293,6 @@ HacksAndPatchesAmd64() {
   mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
   mv ${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/pkgconfig/* \
       ${INSTALL_ROOT}/usr/lib/pkgconfig
-
-  SubBanner "Adding an additional ld.conf include"
-  LD_SO_HACK_CONF="${INSTALL_ROOT}/etc/ld.so.conf.d/zz_hack.conf"
-  echo /usr/lib/gcc/x86_64-linux-gnu/4.6 > "$LD_SO_HACK_CONF"
-  echo /usr/lib >> "$LD_SO_HACK_CONF"
 }
 
 
@@ -318,11 +313,6 @@ HacksAndPatchesI386() {
   mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
   mv ${INSTALL_ROOT}/usr/lib/i386-linux-gnu/pkgconfig/* \
     ${INSTALL_ROOT}/usr/lib/pkgconfig
-
-  SubBanner "Adding an additional ld.conf include"
-  LD_SO_HACK_CONF="${INSTALL_ROOT}/etc/ld.so.conf.d/zz_hack.conf"
-  echo /usr/lib/gcc/i486-linux-gnu/4.6 > "$LD_SO_HACK_CONF"
-  echo /usr/lib >> "$LD_SO_HACK_CONF"
 }