diff --git a/libcxx/utils/ci/buildkite-pipeline-premerge.sh b/.ci/generate-buildkite-pipeline-premerge
copy from libcxx/utils/ci/buildkite-pipeline-premerge.sh
copy to .ci/generate-buildkite-pipeline-premerge
--- a/libcxx/utils/ci/buildkite-pipeline-premerge.sh
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -8,11 +8,10 @@
 #===----------------------------------------------------------------------===##
 
 #
-# This file generates a Buildkite pipeline that triggers the libc++ CI
-# job(s) if needed.
-# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
+# This file generates a Buildkite pipeline that triggers the various CI jobs for
+# the LLVM project during pre-commit CI (each time a Phabricator diff is uploaded).
 #
-# Invoked by CI on pre-merge check for a commit.
+# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
 #
 
 if ! git diff --name-only HEAD~1 | grep -q -E "^libcxx/|^libcxxabi/|^libunwind/|^runtimes/|^cmake/|^clang/"; then
@@ -27,12 +26,28 @@
   buildMessage="Push to branch ${BUILDKITE_BRANCH}"
 fi
 
-
 cat <<EOF
 steps:
+EOF
+
+# If libc++ or one of the runtimes directories changed
+if git diff --name-only HEAD~1 | grep -q -E "^libcxx/|^libcxxabi/|^libunwind/|^runtimes/|^cmake/"; then
+  cat <<EOF
   - trigger: "libcxx-ci"
     build:
       message: "${buildMessage}"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
 EOF
+fi
+
+# If clang changed
+if git diff --name-only HEAD~1 | grep -q -E "^clang/"; then
+  cat <<EOF
+  - trigger: "clang-ci"
+    build:
+      message: "${buildMessage}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+EOF
+fi
diff --git a/libcxx/utils/ci/buildkite-pipeline-snapshot.sh b/.ci/generate-buildkite-pipeline-scheduled
copy from libcxx/utils/ci/buildkite-pipeline-snapshot.sh
copy to .ci/generate-buildkite-pipeline-scheduled
--- a/libcxx/utils/ci/buildkite-pipeline-snapshot.sh
+++ b/.ci/generate-buildkite-pipeline-scheduled
@@ -8,10 +8,10 @@
 #===----------------------------------------------------------------------===##
 
 #
-# This file generates a Buildkite pipeline that triggers the libc++ CI jobs.
-# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
+# This file generates a Buildkite pipeline that triggers the various CI jobs for
+# the LLVM project on scheduled builds.
 #
-# Invoked by CI on full builds.
+# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
 #
 
 cat <<EOF
@@ -21,4 +21,10 @@
       message: "${BUILDKITE_MESSAGE}"
       commit: "${BUILDKITE_COMMIT}"
       branch: "${BUILDKITE_BRANCH}"
+
+  - trigger: "clang-ci"
+    build:
+      message: "${BUILDKITE_MESSAGE}"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
 EOF
diff --git a/clang/foo b/clang/foo
new file mode 100644
diff --git a/libcxx/utils/ci/buildkite-pipeline-premerge.sh b/libcxx/utils/ci/buildkite-pipeline-premerge.sh
--- a/libcxx/utils/ci/buildkite-pipeline-premerge.sh
+++ b/libcxx/utils/ci/buildkite-pipeline-premerge.sh
@@ -7,32 +7,5 @@
 #
 #===----------------------------------------------------------------------===##
 
-#
-# This file generates a Buildkite pipeline that triggers the libc++ CI
-# job(s) if needed.
-# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
-#
-# Invoked by CI on pre-merge check for a commit.
-#
-
-if ! git diff --name-only HEAD~1 | grep -q -E "^libcxx/|^libcxxabi/|^libunwind/|^runtimes/|^cmake/|^clang/"; then
-  # libcxx/, libcxxabi/, libunwind/, runtimes/, cmake/ or clang/ are not affected
-  exit 0
-fi
-
-reviewID="$(git log --format=%B -n 1 | sed -nE 's/^Review-ID:[[:space:]]*(.+)$/\1/p')"
-if [[ "${reviewID}" != "" ]]; then
-  buildMessage="https://llvm.org/${reviewID}"
-else
-  buildMessage="Push to branch ${BUILDKITE_BRANCH}"
-fi
-
-
-cat <<EOF
-steps:
-  - trigger: "libcxx-ci"
-    build:
-      message: "${buildMessage}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-EOF
+# TODO: Remove this once the premerge checks invoke the script below directly.
+./.ci/generate-buildkite-pipeline-premerge
diff --git a/libcxx/utils/ci/buildkite-pipeline-snapshot.sh b/libcxx/utils/ci/buildkite-pipeline-snapshot.sh
--- a/libcxx/utils/ci/buildkite-pipeline-snapshot.sh
+++ b/libcxx/utils/ci/buildkite-pipeline-snapshot.sh
@@ -7,18 +7,5 @@
 #
 #===----------------------------------------------------------------------===##
 
-#
-# This file generates a Buildkite pipeline that triggers the libc++ CI jobs.
-# See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format.
-#
-# Invoked by CI on full builds.
-#
-
-cat <<EOF
-steps:
-  - trigger: "libcxx-ci"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: "${BUILDKITE_COMMIT}"
-      branch: "${BUILDKITE_BRANCH}"
-EOF
+# TODO: Remove this once the premerge checks invoke the script below directly.
+./.ci/generate-buildkite-pipeline-scheduled
diff --git a/libcxx/utils/ci/generate-buildkite-pipeline b/libcxx/utils/ci/generate-buildkite-pipeline
--- a/libcxx/utils/ci/generate-buildkite-pipeline
+++ b/libcxx/utils/ci/generate-buildkite-pipeline
@@ -9,18 +9,9 @@
 
 #
 # This script generates the appropriate libc++ CI pipeline based on which project(s) were changed.
+# TODO: Remove this once the libcxx CI pipeline uploads the buildkite-pipeline.yml file directly.
 #
 
 if git diff --name-only HEAD~1 | grep -q -E "^libcxx/|^libcxxabi/|^libunwind/|^runtimes/|^cmake/"; then
-  LIBCXX_CHANGED=true
-fi
-
-if git diff --name-only HEAD~1 | grep -q -E "^clang/"; then
-  CLANG_CHANGED=true
-fi
-
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
-  cat clang/utils/ci/buildkite-pipeline.yml
-else
   cat libcxx/utils/ci/buildkite-pipeline.yml
 fi