File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -54,12 +54,11 @@ jobs:
54
54
echo "deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic main" | sudo tee -a /etc/apt/sources.list
55
55
echo "deb https://packages.lunarg.com/vulkan bionic main" | sudo tee -a /etc/apt/sources.list
56
56
sudo apt-get update
57
- # Linux systems in GitHub Actions already have a pre-installed clang
58
- # that is not needed for the translator as we rely on newer version
59
- sudo apt-get --purge remove clang-8 clang-9
60
57
sudo apt-get -yq --no-install-suggests --no-install-recommends install \
61
58
clang-${{ env.LLVM_VERSION }} \
62
59
spirv-tools
60
+ # Linux systems in GitHub Actions already have older versions of clang
61
+ # pre-installed. Make sure to override these with the relevant version.
63
62
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.LLVM_VERSION }} 1000
64
63
- name : Checkout LLVM sources
65
64
uses : actions/checkout@v2
Original file line number Diff line number Diff line change @@ -47,15 +47,14 @@ jobs:
47
47
echo "deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic main" | sudo tee -a /etc/apt/sources.list
48
48
echo "deb https://packages.lunarg.com/vulkan bionic main" | sudo tee -a /etc/apt/sources.list
49
49
sudo apt-get update
50
- # Linux systems in GitHub Actions already have a pre-installed clang
51
- # that is not needed for the translator as we rely on newer version
52
- sudo apt-get --purge remove clang-8 clang-9
53
50
sudo apt-get -yq --no-install-suggests --no-install-recommends install \
54
51
clang-${{ env.LLVM_VERSION }} \
55
52
llvm-${{ env.LLVM_VERSION }}-dev \
56
53
libomp-${{ env.LLVM_VERSION }}-dev \
57
54
llvm-${{ env.LLVM_VERSION }}-tools \
58
55
spirv-tools
56
+ # Linux systems in GitHub Actions already have older versions of clang
57
+ # pre-installed. Make sure to override these with the relevant version.
59
58
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.LLVM_VERSION }} 1000
60
59
- name : Checkout the translator sources
61
60
uses : actions/checkout@v2
Original file line number Diff line number Diff line change 41
41
42
42
llvm_config .use_default_substitutions ()
43
43
44
- llvm_config .use_clang ()
44
+ # Explicitly set `use_installed` to alleviate downstream CI pipelines of
45
+ # any additional environment setup for pre-installed Clang usage.
46
+ llvm_config .use_clang (use_installed = True )
45
47
46
48
config .substitutions .append (('%PATH%' , config .environment ['PATH' ]))
47
49
You can’t perform that action at this time.
0 commit comments