diff options
| author | earthdok <earthdok@chromium.org> | 2014-11-20 10:13:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-20 18:14:44 +0000 |
| commit | 7b445146f03bb7886c66662513fef0b21f49a06c (patch) | |
| tree | dc09972683158ee4e6e68de0cdbf8a305c76577b /third_party/instrumented_libraries | |
| parent | 40c05fc136508e06093e399e47cf070cbb26414b (diff) | |
| download | chromium_src-7b445146f03bb7886c66662513fef0b21f49a06c.zip chromium_src-7b445146f03bb7886c66662513fef0b21f49a06c.tar.gz chromium_src-7b445146f03bb7886c66662513fef0b21f49a06c.tar.bz2 | |
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}
Diffstat (limited to 'third_party/instrumented_libraries')
| -rwxr-xr-x | third_party/instrumented_libraries/fix_rpaths.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/third_party/instrumented_libraries/fix_rpaths.sh b/third_party/instrumented_libraries/fix_rpaths.sh index ee1142a..578243f 100755 --- a/third_party/instrumented_libraries/fix_rpaths.sh +++ b/third_party/instrumented_libraries/fix_rpaths.sh @@ -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. |