Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions images/llvm/checkout-llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@ set -o errexit
set -o pipefail
set -o nounset

rev="llvmorg-10.0.0"
rev="llvmorg-17.0.6"

git config --global user.email "maintainer@cilium.io"
git config --global user.name "Cilium Maintainers"

git clone --branch "${rev}" https://github.com/llvm/llvm-project.git /src/llvm

cd /src/llvm
git cherry-pick 29bc5dd19407c4d7cad1c059dea26ee216ddc7ca
git cherry-pick 13f6c81c5d9a7a34a684363bcaad8eb7c65356fd
git cherry-pick ea72b0319d7b0f0c2fcf41d121afa5d031b319d5
cd -

# curl --fail --show-error --silent --location "https://github.com/llvm/llvm-project/archive/${rev}.tar.gz" --output /tmp/llvm.tgz
#
# mkdir -p /src
Expand Down
4 changes: 2 additions & 2 deletions images/llvm/test/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ commandTests:
args: ["--version"]
expectedOutput:
- 'LLVM\ \(http://llvm\.org/\):'
- 'LLVM\ version\ 10\.0\.0'
- 'LLVM\ version\ 17\.0\.6'
- 'Optimized\ build\.'
- 'Registered\ Targets:'
- '(bpf|bpfeb|bpfel)[\ ]+-\ BPF\ \((host|big|little)\ endian\)'
Expand All @@ -24,7 +24,7 @@ commandTests:
command: "clang"
args: ["--version"]
expectedOutput:
- 'clang\ version\ 10\.0\.0\ \(https://github.com/llvm/llvm-project.git\ .*\)'
- 'clang\ version\ 17\.0\.6\ \(https://github.com/llvm/llvm-project.git\ .*\)'
- 'InstalledDir:\ /usr/local/bin'

- name: "clang can compile a simple BPF program"
Expand Down