From 6dfd00e174adfc86b8291c46a06251c42329daa7 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 12 Sep 2019 14:50:32 +0000 Subject: [PATCH] test-release.sh: Don't use chrpath on Solaris 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. Tested on amd64-pc-solaris2.11 and sparcv9-sun-solaris2.11. Differential Revision: https://reviews.llvm.org/D67484 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371741 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/release/test-release.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index 8f691ccfb87..e00a41d3736 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -277,8 +277,11 @@ function check_program_exists() { fi } -if [ "$System" != "Darwin" ]; then +if [ "$System" != "Darwin" -a "$System" != "SunOS" ]; then check_program_exists 'chrpath' +fi + +if [ "$System" != "Darwin" ]; then check_program_exists 'file' check_program_exists 'objdump' fi @@ -444,7 +447,7 @@ function test_llvmCore() { # 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" -- 2.50.1