https://github.com/wenju-he updated 
https://github.com/llvm/llvm-project/pull/186104

>From 180ebf62510f80cb98042ab3de63e6fc56e77812 Mon Sep 17 00:00:00 2001
From: Wenju He <[email protected]>
Date: Thu, 12 Mar 2026 13:07:24 +0100
Subject: [PATCH 1/5] [libclc][CI] Enable libclc in premerge CI with single
 target

Enable libclc build and test in the Linux premerge CI when libclc or
.ci files are modified.
To minimize build time, only build the amdgcn-amd-amdhsa-llvm target.

Update clc.h to test that libclc is built.
---
 .ci/compute_projects.py               |  7 ++++++-
 .ci/compute_projects_test.py          | 20 ++++++++++++++++----
 .ci/monolithic-linux.sh               |  2 ++
 .github/workflows/premerge.yaml       |  2 +-
 libclc/clc/include/clc/internal/clc.h |  4 ++--
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py
index 541b33f5034b1..cf8835dff674b 100644
--- a/.ci/compute_projects.py
+++ b/.ci/compute_projects.py
@@ -81,6 +81,7 @@
     "clang": {"compiler-rt"},
     "clang-tools-extra": {"libc"},
     "libc": {"libc"},
+    "libclc": {"libclc"},
     "compiler-rt": {"compiler-rt"},
     "flang": {"flang-rt"},
     "flang-rt": {"flang-rt"},
@@ -107,6 +108,7 @@
     "libcxxabi",
     "libunwind",
     "flang-rt",
+    "libclc",  # Tests don't work on Windows (check_external_funcs.sh).
 }
 
 # These are projects that we should test if the project itself is changed but
@@ -146,6 +148,7 @@
     "flang": "check-flang",
     "flang-rt": "check-flang-rt",
     "libc": "check-libc",
+    "libclc": "check-libclc",
     "lld": "check-lld",
     "lldb": "check-lldb",
     "mlir": "check-mlir",
@@ -154,7 +157,7 @@
     "lit": "check-lit",
 }
 
-RUNTIMES = {"libcxx", "libcxxabi", "libunwind", "compiler-rt", "libc", 
"flang-rt"}
+RUNTIMES = {"libcxx", "libcxxabi", "libunwind", "compiler-rt", "libc", 
"flang-rt", "libclc"}
 
 # Meta projects are projects that need explicit handling but do not reside
 # in their own top level folder. To add a meta project, the start of the path
@@ -329,6 +332,7 @@ def get_env_variables(modified_files: list[str], platform: 
str) -> Set[str]:
     # to the CMake invocation and thus we need to use the CMake list separator
     # (;). We use spaces to separate the check targets as they end up getting
     # passed to ninja.
+    libclc_targets = "amdgcn-amd-amdhsa-llvm" if "libclc" in runtimes_to_build 
else ""
     return {
         "projects_to_build": ";".join(sorted(projects_to_build)),
         "project_check_targets": " ".join(sorted(projects_check_targets)),
@@ -338,6 +342,7 @@ def get_env_variables(modified_files: list[str], platform: 
str) -> Set[str]:
             sorted(runtimes_check_targets_needs_reconfig)
         ),
         "enable_cir": enable_cir,
+        "libclc_targets": libclc_targets,
     }
 
 
diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py
index f0abdd708ca42..88fc90249f7bf 100644
--- a/.ci/compute_projects_test.py
+++ b/.ci/compute_projects_test.py
@@ -248,6 +248,7 @@ def test_exclude_libcxx_in_projects(self):
         self.assertEqual(env_variables["runtimes_to_build"], "")
         self.assertEqual(env_variables["runtimes_check_targets"], "")
         
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
+        self.assertEqual(env_variables["libclc_targets"], "")
 
     def test_include_libc_in_runtimes(self):
         env_variables = compute_projects.get_env_variables(
@@ -259,6 +260,17 @@ def test_include_libc_in_runtimes(self):
         self.assertEqual(env_variables["runtimes_check_targets"], "check-libc")
         
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
 
+    def test_include_libclc_in_runtimes(self):
+        env_variables = compute_projects.get_env_variables(
+            ["libclc/CMakeLists.txt"], "Linux"
+        )
+        self.assertEqual(env_variables["projects_to_build"], "clang;llvm")
+        self.assertEqual(env_variables["project_check_targets"], "")
+        self.assertEqual(env_variables["runtimes_to_build"], "libclc")
+        self.assertEqual(env_variables["runtimes_check_targets"], 
"check-libclc")
+        
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
+        self.assertEqual(env_variables["libclc_targets"], 
"amdgcn-amd-amdhsa-llvm")
+
     def test_exclude_docs(self):
         env_variables = compute_projects.get_env_variables(
             ["llvm/docs/CIBestPractices.rst"], "Linux"
@@ -297,7 +309,7 @@ def test_ci(self):
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
-            "check-compiler-rt check-flang-rt check-libc",
+            "check-compiler-rt check-flang-rt check-libc check-libclc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets_needs_reconfig"],
@@ -318,7 +330,7 @@ def test_windows_ci(self):
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "compiler-rt;libclc",
+            "compiler-rt",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
@@ -371,7 +383,7 @@ def test_premerge_workflow(self):
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
-            "check-compiler-rt check-flang-rt check-libc",
+            "check-compiler-rt check-flang-rt check-libc check-libclc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets_needs_reconfig"],
@@ -406,7 +418,7 @@ def test_third_party_benchmark(self):
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
-            "check-compiler-rt check-flang-rt check-libc",
+            "check-compiler-rt check-flang-rt check-libc check-libclc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets_needs_reconfig"],
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 217da893e947a..3c94d63ac4129 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -28,6 +28,7 @@ runtimes="${3}"
 runtime_targets="${4}"
 runtime_targets_needs_reconfig="${5}"
 enable_cir="${6}"
+libclc_targets="${7}"
 
 lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml 
--use-unique-output-file-name --timeout=1200 --time-tests --succinct"
 
@@ -56,6 +57,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
       -D CMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
       -D LIBCXX_CXX_ABI=libcxxabi \
+      -D LIBCLC_TARGETS_TO_BUILD="${libclc_targets}" \
       -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
       -D LLDB_ENABLE_PYTHON=ON \
       -D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 1795d5256750f..b735c1366fa9d 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -104,7 +104,7 @@ jobs:
           mkdir artifacts
           SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log 
sccache --start-server
 
-          ./.ci/monolithic-linux.sh "${projects_to_build}" 
"${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" 
"${runtimes_check_targets_needs_reconfig}" "${enable_cir}"
+          ./.ci/monolithic-linux.sh "${projects_to_build}" 
"${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" 
"${runtimes_check_targets_needs_reconfig}" "${enable_cir}" "${libclc_targets}"
       - name: Upload Artifacts
         # In some cases, Github will fail to upload the artifact. We want to
         # continue anyways as a failed artifact upload is an infra failure, not
diff --git a/libclc/clc/include/clc/internal/clc.h 
b/libclc/clc/include/clc/internal/clc.h
index fcfb223d5a12d..99ce15309fdd3 100644
--- a/libclc/clc/include/clc/internal/clc.h
+++ b/libclc/clc/include/clc/internal/clc.h
@@ -24,12 +24,12 @@
 #endif
 
 /* Function Attributes */
-#include <clc/clcfunc.h>
+#include "clc/clcfunc.h"
 
 /* 6.1 Supported Data Types */
 
 /* 6.2.4.2 Reinterpreting Types Using __clc_as_type() and __clc_as_typen() */
-#include <clc/clc_as_type.h>
+#include "clc/clc_as_type.h"
 
 #pragma OPENCL EXTENSION all : disable
 

>From 6a62b62d08eade457d6b31163b4b6d319a34c098 Mon Sep 17 00:00:00 2001
From: Wenju He <[email protected]>
Date: Thu, 12 Mar 2026 13:33:49 +0100
Subject: [PATCH 2/5] code formatter

---
 .ci/compute_projects.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py
index cf8835dff674b..8f57987b088a5 100644
--- a/.ci/compute_projects.py
+++ b/.ci/compute_projects.py
@@ -157,7 +157,15 @@
     "lit": "check-lit",
 }
 
-RUNTIMES = {"libcxx", "libcxxabi", "libunwind", "compiler-rt", "libc", 
"flang-rt", "libclc"}
+RUNTIMES = {
+    "libcxx",
+    "libcxxabi",
+    "libunwind",
+    "compiler-rt",
+    "libc",
+    "flang-rt",
+    "libclc",
+}
 
 # Meta projects are projects that need explicit handling but do not reside
 # in their own top level folder. To add a meta project, the start of the path

>From 26e8c8916b1fc8190bcbf02cb25bcf9451197121 Mon Sep 17 00:00:00 2001
From: Wenju He <[email protected]>
Date: Thu, 12 Mar 2026 22:46:54 +0100
Subject: [PATCH 3/5] enable libclc build on windows, revert change to clc.h

---
 .ci/compute_projects.py               | 8 +++++---
 .ci/compute_projects_test.py          | 6 +++---
 libclc/clc/include/clc/internal/clc.h | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py
index 8f57987b088a5..ec426d69efd7c 100644
--- a/.ci/compute_projects.py
+++ b/.ci/compute_projects.py
@@ -108,7 +108,6 @@
     "libcxxabi",
     "libunwind",
     "flang-rt",
-    "libclc",  # Tests don't work on Windows (check_external_funcs.sh).
 }
 
 # These are projects that we should test if the project itself is changed but
@@ -167,6 +166,10 @@
     "libclc",
 }
 
+LIBCLC_TARGETS = {
+    "amdgcn-amd-amdhsa-llvm",
+}
+
 # Meta projects are projects that need explicit handling but do not reside
 # in their own top level folder. To add a meta project, the start of the path
 # for the metaproject should be mapped to the name of the project below.
@@ -340,7 +343,6 @@ def get_env_variables(modified_files: list[str], platform: 
str) -> Set[str]:
     # to the CMake invocation and thus we need to use the CMake list separator
     # (;). We use spaces to separate the check targets as they end up getting
     # passed to ninja.
-    libclc_targets = "amdgcn-amd-amdhsa-llvm" if "libclc" in runtimes_to_build 
else ""
     return {
         "projects_to_build": ";".join(sorted(projects_to_build)),
         "project_check_targets": " ".join(sorted(projects_check_targets)),
@@ -350,7 +352,7 @@ def get_env_variables(modified_files: list[str], platform: 
str) -> Set[str]:
             sorted(runtimes_check_targets_needs_reconfig)
         ),
         "enable_cir": enable_cir,
-        "libclc_targets": libclc_targets,
+        "libclc_targets": ";".join(LIBCLC_TARGETS),
     }
 
 
diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py
index 88fc90249f7bf..25c9882db1289 100644
--- a/.ci/compute_projects_test.py
+++ b/.ci/compute_projects_test.py
@@ -248,7 +248,7 @@ def test_exclude_libcxx_in_projects(self):
         self.assertEqual(env_variables["runtimes_to_build"], "")
         self.assertEqual(env_variables["runtimes_check_targets"], "")
         
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
-        self.assertEqual(env_variables["libclc_targets"], "")
+        self.assertEqual(env_variables["libclc_targets"], 
"amdgcn-amd-amdhsa-llvm")
 
     def test_include_libc_in_runtimes(self):
         env_variables = compute_projects.get_env_variables(
@@ -330,11 +330,11 @@ def test_windows_ci(self):
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "compiler-rt",
+            "compiler-rt;libclc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
-            "check-compiler-rt",
+            "check-compiler-rt check-libclc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets_needs_reconfig"],
diff --git a/libclc/clc/include/clc/internal/clc.h 
b/libclc/clc/include/clc/internal/clc.h
index 99ce15309fdd3..fcfb223d5a12d 100644
--- a/libclc/clc/include/clc/internal/clc.h
+++ b/libclc/clc/include/clc/internal/clc.h
@@ -24,12 +24,12 @@
 #endif
 
 /* Function Attributes */
-#include "clc/clcfunc.h"
+#include <clc/clcfunc.h>
 
 /* 6.1 Supported Data Types */
 
 /* 6.2.4.2 Reinterpreting Types Using __clc_as_type() and __clc_as_typen() */
-#include "clc/clc_as_type.h"
+#include <clc/clc_as_type.h>
 
 #pragma OPENCL EXTENSION all : disable
 

>From e55e0a46836577411a09a19a905ec596d783100b Mon Sep 17 00:00:00 2001
From: Wenju He <[email protected]>
Date: Fri, 13 Mar 2026 01:16:47 +0100
Subject: [PATCH 4/5] pass libclc_targets to monolithic-windows.sh

---
 .ci/monolithic-windows.sh       | 2 ++
 .github/workflows/premerge.yaml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index a04c1ff6e41e6..b7ef711277127 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -19,6 +19,7 @@ projects="${1}"
 targets="${2}"
 runtimes="${3}"
 runtimes_targets="${4}"
+libclc_targets="${5}"
 
 start-group "CMake"
 pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
@@ -45,6 +46,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
       -D CMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
       -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
+      -D LIBCLC_TARGETS_TO_BUILD="${libclc_targets}" \
       -D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
       -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
       -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index b735c1366fa9d..816e961320a2a 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -159,6 +159,7 @@ jobs:
           echo "windows-check-targets=${project_check_targets}" >> 
$GITHUB_OUTPUT
           echo "windows-runtimes=${runtimes_to_build}" >> $GITHUB_OUTPUT
           echo "windows-runtimes-check-targets=${runtimes_check_targets}" >> 
$GITHUB_OUTPUT
+          echo "windows-libclc-targets=${libclc_targets}" >> $GITHUB_OUTPUT
       - name: Build and Test
         timeout-minutes: 180
         if: ${{ steps.vars.outputs.windows-projects != '' }}
@@ -170,7 +171,7 @@ jobs:
           call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 
-host_arch=amd64
           # See the comments above in the Linux job for why we define each of
           # these environment variables.
-          bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export 
SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; mkdir artifacts; 
SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log sccache 
--start-server; .ci/monolithic-windows.sh \"${{ 
steps.vars.outputs.windows-projects }}\" \"${{ 
steps.vars.outputs.windows-check-targets }}\" \"${{ 
steps.vars.outputs.windows-runtimes }}\" \"${{ 
steps.vars.outputs.windows-runtimes-check-targets }}\""
+          bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export 
SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; mkdir artifacts; 
SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log sccache 
--start-server; .ci/monolithic-windows.sh \"${{ 
steps.vars.outputs.windows-projects }}\" \"${{ 
steps.vars.outputs.windows-check-targets }}\" \"${{ 
steps.vars.outputs.windows-runtimes }}\" \"${{ 
steps.vars.outputs.windows-runtimes-check-targets }}\" \"${{ 
steps.vars.outputs.windows-libclc-targets }}\""
       - name: Upload Artifacts
         # In some cases, Github will fail to upload the artifact. We want to
         # continue anyways as a failed artifact upload is an infra failure, not

>From 2cce1397ef2a21d58c604a354f335c746ae2419b Mon Sep 17 00:00:00 2001
From: Wenju He <[email protected]>
Date: Mon, 16 Mar 2026 13:20:55 +0100
Subject: [PATCH 5/5] hardcode amdgcn-amd-amdhsa-llvm, fix test

---
 .ci/compute_projects.py         | 5 -----
 .ci/compute_projects_test.py    | 2 --
 .ci/monolithic-linux.sh         | 3 +--
 .ci/monolithic-windows.sh       | 3 +--
 .github/workflows/premerge.yaml | 5 ++---
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py
index ec426d69efd7c..9c7ad73710ae2 100644
--- a/.ci/compute_projects.py
+++ b/.ci/compute_projects.py
@@ -166,10 +166,6 @@
     "libclc",
 }
 
-LIBCLC_TARGETS = {
-    "amdgcn-amd-amdhsa-llvm",
-}
-
 # Meta projects are projects that need explicit handling but do not reside
 # in their own top level folder. To add a meta project, the start of the path
 # for the metaproject should be mapped to the name of the project below.
@@ -352,7 +348,6 @@ def get_env_variables(modified_files: list[str], platform: 
str) -> Set[str]:
             sorted(runtimes_check_targets_needs_reconfig)
         ),
         "enable_cir": enable_cir,
-        "libclc_targets": ";".join(LIBCLC_TARGETS),
     }
 
 
diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py
index 25c9882db1289..3069c66940c3a 100644
--- a/.ci/compute_projects_test.py
+++ b/.ci/compute_projects_test.py
@@ -248,7 +248,6 @@ def test_exclude_libcxx_in_projects(self):
         self.assertEqual(env_variables["runtimes_to_build"], "")
         self.assertEqual(env_variables["runtimes_check_targets"], "")
         
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
-        self.assertEqual(env_variables["libclc_targets"], 
"amdgcn-amd-amdhsa-llvm")
 
     def test_include_libc_in_runtimes(self):
         env_variables = compute_projects.get_env_variables(
@@ -269,7 +268,6 @@ def test_include_libclc_in_runtimes(self):
         self.assertEqual(env_variables["runtimes_to_build"], "libclc")
         self.assertEqual(env_variables["runtimes_check_targets"], 
"check-libclc")
         
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
-        self.assertEqual(env_variables["libclc_targets"], 
"amdgcn-amd-amdhsa-llvm")
 
     def test_exclude_docs(self):
         env_variables = compute_projects.get_env_variables(
diff --git a/.ci/monolithic-linux.sh b/.ci/monolithic-linux.sh
index 3c94d63ac4129..79fc891b729d7 100755
--- a/.ci/monolithic-linux.sh
+++ b/.ci/monolithic-linux.sh
@@ -28,7 +28,6 @@ runtimes="${3}"
 runtime_targets="${4}"
 runtime_targets_needs_reconfig="${5}"
 enable_cir="${6}"
-libclc_targets="${7}"
 
 lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml 
--use-unique-output-file-name --timeout=1200 --time-tests --succinct"
 
@@ -57,7 +56,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
       -D CMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
       -D LIBCXX_CXX_ABI=libcxxabi \
-      -D LIBCLC_TARGETS_TO_BUILD="${libclc_targets}" \
+      -D LIBCLC_TARGETS_TO_BUILD="amdgcn-amd-amdhsa-llvm" \
       -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
       -D LLDB_ENABLE_PYTHON=ON \
       -D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
diff --git a/.ci/monolithic-windows.sh b/.ci/monolithic-windows.sh
index b7ef711277127..f0c0420760df9 100755
--- a/.ci/monolithic-windows.sh
+++ b/.ci/monolithic-windows.sh
@@ -19,7 +19,6 @@ projects="${1}"
 targets="${2}"
 runtimes="${3}"
 runtimes_targets="${4}"
-libclc_targets="${5}"
 
 start-group "CMake"
 pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
@@ -46,7 +45,7 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
       -D CMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
       -D MLIR_ENABLE_BINDINGS_PYTHON=ON \
-      -D LIBCLC_TARGETS_TO_BUILD="${libclc_targets}" \
+      -D LIBCLC_TARGETS_TO_BUILD="amdgcn-amd-amdhsa-llvm" \
       -D CMAKE_EXE_LINKER_FLAGS="/MANIFEST:NO" \
       -D CMAKE_MODULE_LINKER_FLAGS="/MANIFEST:NO" \
       -D CMAKE_SHARED_LINKER_FLAGS="/MANIFEST:NO" \
diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 816e961320a2a..1795d5256750f 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -104,7 +104,7 @@ jobs:
           mkdir artifacts
           SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log 
sccache --start-server
 
-          ./.ci/monolithic-linux.sh "${projects_to_build}" 
"${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" 
"${runtimes_check_targets_needs_reconfig}" "${enable_cir}" "${libclc_targets}"
+          ./.ci/monolithic-linux.sh "${projects_to_build}" 
"${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" 
"${runtimes_check_targets_needs_reconfig}" "${enable_cir}"
       - name: Upload Artifacts
         # In some cases, Github will fail to upload the artifact. We want to
         # continue anyways as a failed artifact upload is an infra failure, not
@@ -159,7 +159,6 @@ jobs:
           echo "windows-check-targets=${project_check_targets}" >> 
$GITHUB_OUTPUT
           echo "windows-runtimes=${runtimes_to_build}" >> $GITHUB_OUTPUT
           echo "windows-runtimes-check-targets=${runtimes_check_targets}" >> 
$GITHUB_OUTPUT
-          echo "windows-libclc-targets=${libclc_targets}" >> $GITHUB_OUTPUT
       - name: Build and Test
         timeout-minutes: 180
         if: ${{ steps.vars.outputs.windows-projects != '' }}
@@ -171,7 +170,7 @@ jobs:
           call C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 
-host_arch=amd64
           # See the comments above in the Linux job for why we define each of
           # these environment variables.
-          bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export 
SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; mkdir artifacts; 
SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log sccache 
--start-server; .ci/monolithic-windows.sh \"${{ 
steps.vars.outputs.windows-projects }}\" \"${{ 
steps.vars.outputs.windows-check-targets }}\" \"${{ 
steps.vars.outputs.windows-runtimes }}\" \"${{ 
steps.vars.outputs.windows-runtimes-check-targets }}\" \"${{ 
steps.vars.outputs.windows-libclc-targets }}\""
+          bash -c "export SCCACHE_GCS_BUCKET=$CACHE_GCS_BUCKET; export 
SCCACHE_GCS_RW_MODE=READ_WRITE; export SCCACHE_IDLE_TIMEOUT=0; mkdir artifacts; 
SCCACHE_LOG=info SCCACHE_ERROR_LOG=$(pwd)/artifacts/sccache.log sccache 
--start-server; .ci/monolithic-windows.sh \"${{ 
steps.vars.outputs.windows-projects }}\" \"${{ 
steps.vars.outputs.windows-check-targets }}\" \"${{ 
steps.vars.outputs.windows-runtimes }}\" \"${{ 
steps.vars.outputs.windows-runtimes-check-targets }}\""
       - name: Upload Artifacts
         # In some cases, Github will fail to upload the artifact. We want to
         # continue anyways as a failed artifact upload is an infra failure, not

_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to