Skip to content

Commit 4f92029

Browse files
authored
[CI] Install clang and libc++ in build containers (#19567)
I'm planning to add a build using libc++ to the nightly, so we need clang and libc++ installed. Installing clang shouldn't cause a problem with the wrong clang being used for LIT testing as we pass the absolute path to the built clang, ex here. build-e2e: ``` Run cmake -GNinja -B./build-e2e -S./llvm/sycl/test-e2e \ -DCMAKE_CXX_COMPILER="$GITHUB_WORKSPACE/toolchain/bin/clang++" -DLLVM_LIT="$PWD/llvm/llvm/utils/lit/lit.py" ``` run-e2e: ``` echo PATH=$PWD/toolchain/bin/:$PATH >> $GITHUB_ENV ``` We need to specify the clang version to install because of some Ubuntu nonsense. Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 6653a66 commit 4f92029

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

devops/scripts/install_build_tools.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apt update && apt install -yqq \
2626
curl \
2727
libhwloc-dev \
2828
libzstd-dev \
29-
time
29+
time
3030

3131
# To obtain latest release of spriv-tool.
3232
# Same as what's done in SPRIV-LLVM-TRANSLATOR:
@@ -36,3 +36,9 @@ apt update && apt install -yqq \
3636
curl -L "https://packages.lunarg.com/lunarg-signing-key-pub.asc" | apt-key add -
3737
echo "deb https://packages.lunarg.com/vulkan $VERSION_CODENAME main" | tee -a /etc/apt/sources.list
3838
apt update && apt install -yqq spirv-tools pkg-config
39+
40+
if [[ "$VERSION_CODENAME" == "jammy" ]]; then
41+
apt-get install -yqq clang-14 libc++-14-dev
42+
else
43+
apt-get install -yqq clang-18 libc++-18-dev
44+
fi

0 commit comments

Comments
 (0)