Commit a0ca4a35 authored by thomasanderson's avatar thomasanderson Committed by Commit bot

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

This CL removes a hack that adds /usr/lib/gcc/x86_64-linux-gnu/4.6 to
ld.so.conf.d/zz_hack.conf.  The only sysroots that exist currently are
Jessie and Trusty which both use gcc 4.8.

This caused the following flags to be passed to the linker:
-L/path/to/chromium/src/build/linux/debian_jessie_amd64-sysroot/usr/lib/gcc/x86_64-linux-gnu/4.6
-Wl,-rpath-link=/path/to/chromium/src/build/linux/debian_jessie_amd64-sysroot/usr/lib/gcc/x86_64-linux-gnu/4.6
While harmless, it is confusing and should be removed.

R=thestig@chromium.org

Review-Url: https://codereview.chromium.org/2863663003
Cr-Commit-Position: refs/heads/master@{#469518}
parent a1215009
...@@ -293,11 +293,6 @@ HacksAndPatchesAmd64() { ...@@ -293,11 +293,6 @@ HacksAndPatchesAmd64() {
mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
mv ${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/pkgconfig/* \ mv ${INSTALL_ROOT}/usr/lib/x86_64-linux-gnu/pkgconfig/* \
${INSTALL_ROOT}/usr/lib/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() { ...@@ -318,11 +313,6 @@ HacksAndPatchesI386() {
mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig mkdir -p ${INSTALL_ROOT}/usr/lib/pkgconfig
mv ${INSTALL_ROOT}/usr/lib/i386-linux-gnu/pkgconfig/* \ mv ${INSTALL_ROOT}/usr/lib/i386-linux-gnu/pkgconfig/* \
${INSTALL_ROOT}/usr/lib/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"
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment