From 7b445146f03bb7886c66662513fef0b21f49a06c Mon Sep 17 00:00:00 2001
From: earthdok <earthdok@chromium.org>
Date: Thu, 20 Nov 2014 10:13:54 -0800
Subject: 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}
---
 third_party/instrumented_libraries/fix_rpaths.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'third_party/instrumented_libraries')

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.
-- 
cgit v1.1