[libcxx-commits] [libcxx] ab55897 - [libc++] Allow passing relative paths to the Apple install script

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-10-13T12:27:47-04:00
New Revision: ab55897817cc09113a9729d4ed907e13aa0386ff

URL: https://github.com/llvm/llvm-project/commit/ab55897817cc09113a9729d4ed907e13aa0386ff
DIFF: https://github.com/llvm/llvm-project/commit/ab55897817cc09113a9729d4ed907e13aa0386ff.diff

LOG: [libc++] Allow passing relative paths to the Apple install script

Added: 
    

Modified: 
    libcxx/utils/ci/apple-install-libcxx.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh
index 7c3517d7c88d..74d7b24ac00d 100755
--- a/libcxx/utils/ci/apple-install-libcxx.sh
+++ b/libcxx/utils/ci/apple-install-libcxx.sh
@@ -20,15 +20,15 @@ ${PROGNAME} [options]
 
 [-h|--help]                  Display this help and exit.
 
---llvm-root <DIR>            Full path to the root of the LLVM monorepo. Only the libcxx
+--llvm-root <DIR>            Path to the root of the LLVM monorepo. Only the libcxx
                              and libcxxabi directories are required.
 
---build-dir <DIR>            Full path to the directory to use for building. This will
+--build-dir <DIR>            Path to the directory to use for building. This will
                              contain intermediate build products.
 
---install-dir <DIR>          Full path to the directory to install the library to.
+--install-dir <DIR>          Path to the directory to install the library to.
 
---symbols-dir <DIR>          Full path to the directory to install the .dSYM bundle to.
+--symbols-dir <DIR>          Path to the directory to install the .dSYM bundle to.
 
 --sdk <SDK>                  SDK used for building the library. This represents
                              the target platform that the library will run on.
@@ -97,6 +97,12 @@ for arg in llvm_root build_dir symbols_dir install_dir sdk architectures version
     fi
 done
 
+# Allow using relative paths
+for arg in llvm_root build_dir symbols_dir install_dir cache; do
+    path="$(realpath "${!arg}")"
+    eval "${arg}=\"${path}\""
+done
+
 function step() {
     separator="$(printf "%0.s-" $(seq 1 ${#1}))"
     echo