[libcxx-commits] [libcxx] 79410dd - [libc++][ci] Add a configuration testing Apple's system library build

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-10-01T10:37:36-04:00
New Revision: 79410ddb96d42b72b5a7081fd680a28ae760fd51

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

LOG: [libc++][ci] Add a configuration testing Apple's system library build

Differential Revision: https://reviews.llvm.org/D88650

Added: 
    

Modified: 
    libcxx/utils/ci/buildkite-pipeline.yml
    libcxx/utils/ci/run-buildbot.sh

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index db9c4c2b9fc8..d9fb0925c6d8 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -74,3 +74,13 @@ steps:
     command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-singlethreaded | libcxx/utils/ci/phabricator-report"
     agents:
       queue: "libcxx-builders"
+
+  # Build with the configuration we use to generate libc++.dylib on Apple platforms
+  - label: "Apple system"
+    command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-apple-system | libcxx/utils/ci/phabricator-report"
+    agents:
+      queue: "libcxx-macos-builders"
+  - label: "Apple system -fno-exceptions"
+    command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-apple-system-noexceptions | libcxx/utils/ci/phabricator-report"
+    agents:
+      queue: "libcxx-macos-builders"

diff  --git a/libcxx/utils/ci/run-buildbot.sh b/libcxx/utils/ci/run-buildbot.sh
index 25cdcc3ee164..1f4b5df731ff 100755
--- a/libcxx/utils/ci/run-buildbot.sh
+++ b/libcxx/utils/ci/run-buildbot.sh
@@ -10,6 +10,8 @@
 set -ex
 
 BUILDER="${1}"
+MONOREPO_ROOT="$(git rev-parse --show-toplevel)"
+BUILD_DIR="${MONOREPO_ROOT}/build/${BUILDER}"
 
 args=()
 args+=("-DLLVM_ENABLE_PROJECTS=libcxx;libunwind;libcxxabi")
@@ -100,19 +102,29 @@ x86_64-ubuntu-singlethreaded)
     args+=("-DLIBCXXABI_ENABLE_THREADS=OFF")
     args+=("-DLIBCXX_ENABLE_MONOTONIC_CLOCK=OFF")
 ;;
+x86_64-apple-system)
+    export CC=clang
+    export CXX=clang++
+    args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
+    args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake")
+;;
+x86_64-apple-system-noexceptions)
+    export CC=clang
+    export CXX=clang++
+    args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
+    args+=("-C${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake")
+    args+=("-DLIBCXX_ENABLE_EXCEPTIONS=OFF")
+    args+=("-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF")
+;;
 *)
     echo "${BUILDER} is not a known configuration"
     exit 1
 ;;
 esac
 
-UMBRELLA_ROOT="$(git rev-parse --show-toplevel)"
-LLVM_ROOT="${UMBRELLA_ROOT}/llvm"
-BUILD_DIR="${UMBRELLA_ROOT}/build/${BUILDER}"
-
 echo "--- Generating CMake"
 rm -rf "${BUILD_DIR}"
-cmake -S "${LLVM_ROOT}" -B "${BUILD_DIR}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo "${args[@]}"
+cmake -S "${MONOREPO_ROOT}/llvm" -B "${BUILD_DIR}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo "${args[@]}"
 
 echo "--- Building libc++ and libc++abi"
 ninja -C "${BUILD_DIR}" check-cxx-deps cxxabi