[PATCH] D67484: test-release.sh: Don't use chrpath on Solaris

Rainer Orth via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 12 02:30:10 PDT 2019


ro created this revision.
ro added reviewers: tstellar, hans.
Herald added subscribers: fedor.sergeev, jyknight.
Herald added a project: LLVM.

When trying to run `test-release.sh` on Solaris 11.4 for 9.0.0 rc4, I failed initially
because Solaris lacks `chrpath`.  This patch accounts for that and allowed the run to
continue.

However, when its use was introduced back in 2013 r194999 <https://github.com/llvm/llvm-project/commit/69690e415653100353d4d4091a8899ec4519c4a8#diff-b1c79b7284afcc4cbd22b2521c023ccd>, it was justified by a libtool quirk
of emedding build directories in RPATHs.  Given that libtool isn't used any longer, one
might instead want to revert that patch instead.

The current version was tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11.`


Repository:
  rL LLVM

https://reviews.llvm.org/D67484

Files:
  utils/release/test-release.sh


Index: utils/release/test-release.sh
===================================================================
--- utils/release/test-release.sh
+++ utils/release/test-release.sh
@@ -277,8 +277,11 @@
   fi
 }
 
+if [ "$System" != "Darwin" -a "$System" != "SunOS" ]; then
+  check_program_exists 'chrpath'
+fi
+
 if [ "$System" != "Darwin" ]; then
-  check_program_exists 'chrpath'
   check_program_exists 'file'
   check_program_exists 'objdump'
 fi
@@ -444,7 +447,7 @@
 # Clean RPATH. Libtool adds the build directory to the search path, which is
 # not necessary --- and even harmful --- for the binary packages we release.
 function clean_RPATH() {
-  if [ "$System" = "Darwin" ]; then
+  if [ "$System" = "Darwin" -o "$System" = "SunOS" ]; then
     return
   fi
   local InstallPath="$1"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67484.219862.patch
Type: text/x-patch
Size: 787 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190912/b15cb94a/attachment.bin>


More information about the llvm-commits mailing list