Skip to content

Commit b356c85

Browse files
authored
Update LLVM from v10 to v12 (microsoft#2617)
While I was investigating `llvm-symbolizer` issues, I found that we are installing LLVM-10 by default. Now that we are using the Ubuntu 20.04 image as the default, use the latest LLVM version available for that release. (In addition, v12 is also available on 22.04, whereas v10 is not.)
1 parent 2685cb6 commit b356c85

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/ci/dotnet-fuzzing-tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mkdir -p $ARTIFACTS/LibFuzzerDotnetLoader
2020
mkdir -p $ARTIFACTS/sharpfuzz
2121

2222
# Install `libfuzzer-dotnet` pre-reqs.
23-
sudo apt-get install -y llvm-10 llvm-10-dev clang-10
23+
sudo apt-get install -y llvm-12 llvm-12-dev clang-12
2424

2525
# Note that dotnet pre-reqs are presumed to be installed
2626
# by the ci.yml setup (`setup-dotnet` action).

src/runtime-tools/linux/setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ if type apt > /dev/null 2> /dev/null; then
124124
done
125125

126126
if ! [ -f ${LLVM_SYMBOLIZER_PATH} ]; then
127-
until sudo apt install -y llvm-10; do
127+
until sudo apt install -y llvm-12; do
128128
echo "apt failed, sleeping 10s then retrying"
129129
sleep 10
130130
done
131131

132132
# If specifying symbolizer, exe name must be a "known symbolizer".
133-
# Using `llvm-symbolizer` works for clang 8 .. 10.
134-
sudo ln -f -s $(which llvm-symbolizer-10) $LLVM_SYMBOLIZER_PATH
133+
# Using `llvm-symbolizer` works for clang 8 .. 12.
134+
sudo ln -f -s $(which llvm-symbolizer-12) $LLVM_SYMBOLIZER_PATH
135135
fi
136136

137137
# Install dotnet

src/runtime-tools/win64/onefuzz.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function Install-LLVM {
126126
log "installing llvm"
127127
$ProgressPreference = 'SilentlyContinue'
128128
$exe_path = "llvm-setup.exe"
129-
Invoke-WebRequest -uri https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe -OutFile $exe_path
129+
Invoke-WebRequest -uri https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/LLVM-12.0.1-win64.exe -OutFile $exe_path
130130
cmd /c start /wait $exe_path /S
131131
$env:Path += ";$env:ProgramFiles\LLVM\bin"
132132
log "installing llvm: done"

0 commit comments

Comments
 (0)