Commit 7b445146 authored by earthdok's avatar earthdok Committed by Commit bot

Instrumented libraries: fix zlib1g build on Precise.

BUG=435109
TBR=glider@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/744863003

Cr-Commit-Position: refs/heads/master@{#305036}
parent 40c05fc1
......@@ -10,9 +10,14 @@
function fix_rpath {
if [ -w "$1" ]
then
echo "fix_rpaths.sh: fixing $1"
chrpath -r $(chrpath $1 | cut -d " " -f 2 | sed s/XORIGIN/\$ORIGIN/g \
| sed s/RPATH=//g) $1 > /dev/null
# Only attempt to fix RPATH if the entry actually exists.
# FIXME(earthdok): find out why zlib1g on Precise doesn't get RPATH set.
if chrpath -l $1
then
echo "fix_rpaths.sh: fixing $1"
chrpath -r $(chrpath $1 | cut -d " " -f 2 | sed s/XORIGIN/\$ORIGIN/g \
| sed s/RPATH=//g) $1
fi
else
# FIXME(earthdok): libcups2 DSOs are created non-writable, causing this
# script to fail. As a temporary measure, ignore non-writable files.
......
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