Skip to content

Commit 3467f51

Browse files
kakkoyunkakkoyun
authored
Pin clang version (#1046)
* Pin clang version Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Use lld Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Install LLVM only once Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Use ld Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Speficify LD AND C flags Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Clean before test Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> * Add fPIC Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com> Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
1 parent e127ebf commit 3467f51

File tree

7 files changed

+44
-16
lines changed

7 files changed

+44
-16
lines changed

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,17 @@ jobs:
6060
check-latest: true
6161
cache: true
6262

63+
- name: Set up Clang
64+
uses: KyleMayes/install-llvm-action@v1
65+
with:
66+
version: "11"
67+
68+
- name: clang version
69+
run: |
70+
clang -v
71+
ld --version
72+
ld.lld --version
73+
6374
- name: Set up gofumpt
6475
run: go install "mvdan.cc/gofumpt@${GOFUMPT_VERSION}"
6576

@@ -72,8 +83,7 @@ jobs:
7283
- name: Install libbpf dependencies
7384
run: |
7485
sudo apt-get update -y
75-
sudo apt-get install -yq libelf-dev zlib1g-dev llvm-11
76-
sudo ln -s /usr/lib/llvm-11/bin/* /usr/local/bin/
86+
sudo apt-get install -yq libelf-dev zlib1g-dev
7787
7888
- name: Initialize and update git submodules
7989
run: git submodule init && git submodule update
@@ -92,6 +102,7 @@ jobs:
92102

93103
- name: Test
94104
run: |
105+
make clean bpf
95106
make test ENABLE_RACE=yes
96107
97108
- name: Test unwind tables

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@ jobs:
5050
go-version-file: .go-version
5151
cache: true
5252

53-
- name: clang version
54-
run: clang -v
53+
- name: Set up Clang
54+
uses: KyleMayes/install-llvm-action@v1
55+
with:
56+
version: "11"
5557

5658
- name: Install libbpf dependencies
5759
run: |
5860
sudo apt-get update -y
59-
sudo apt-get install -yq libelf-dev zlib1g-dev llvm-11
60-
sudo ln -s /usr/lib/llvm-11/bin/* /usr/local/bin/
61+
sudo apt-get install -yq libelf-dev zlib1g-dev
6162
6263
- name: Initialize and update libbpf submodule
6364
run: git submodule init && git submodule update

‎.github/workflows/container.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,15 @@ jobs:
6767
with:
6868
go-version-file: .go-version
6969

70+
- name: Set up Clang
71+
uses: KyleMayes/install-llvm-action@v1
72+
with:
73+
version: "11"
74+
7075
- name: Install libbpf dependencies
7176
run: |
7277
sudo apt-get update -y
73-
sudo apt-get install -yq libelf-dev zlib1g-dev llvm-11
74-
sudo ln -s /usr/lib/llvm-11/bin/* /usr/local/bin/
78+
sudo apt-get install -yq libelf-dev zlib1g-dev
7579
7680
- name: Initialize and update libbpf submodule
7781
run: git submodule init && git submodule update

‎.github/workflows/docs.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ jobs:
5050
go-version-file: .go-version
5151
cache: true
5252

53+
- name: Set up Clang
54+
uses: KyleMayes/install-llvm-action@v1
55+
with:
56+
version: "11"
57+
5358
- name: Install libbpf dependencies
5459
run: |
5560
sudo apt-get update -y
56-
sudo apt-get install -yq libelf-dev zlib1g-dev llvm-11
57-
sudo ln -s /usr/lib/llvm-11/bin/* /usr/local/bin/
61+
sudo apt-get install -yq libelf-dev zlib1g-dev
5862
5963
- name: Initialize and update libbpf submodule
6064
run: git submodule init && git submodule update

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ jobs:
2525
with:
2626
go-version-file: .go-version
2727

28+
- name: Set up Clang
29+
uses: KyleMayes/install-llvm-action@v1
30+
with:
31+
version: "11"
32+
2833
- name: Install libbpf dependencies
2934
run: |
3035
sudo apt-get update -y
31-
sudo apt-get install -yq libelf-dev zlib1g-dev llvm-11
32-
sudo ln -s /usr/lib/llvm-11/bin/* /usr/local/bin/
36+
sudo apt-get install -yq libelf-dev zlib1g-dev
3337
3438
- name: Initialize and update libbpf submodule
3539
run: git submodule init && git submodule update

‎.github/workflows/snap.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@ jobs:
6161
with:
6262
go-version-file: .go-version
6363

64+
- name: Set up Clang
65+
uses: KyleMayes/install-llvm-action@v1
66+
with:
67+
version: "11"
68+
6469
- name: Install libbpf dependencies
6570
run: |
6671
sudo apt-get update -y
67-
sudo apt-get install -yq libelf-dev zlib1g-dev llvm-11
68-
sudo ln -s /usr/lib/llvm-11/bin/* /usr/local/bin/
72+
sudo apt-get install -yq libelf-dev zlib1g-dev
6973
7074
- name: Initialize and update libbpf submodule
7175
run: git submodule init && git submodule update

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ CGO_LDFLAGS_DYN = -L$(abspath $(LIBBPF_DIR)) -fuse-ld=ld -lelf -lz -lbpf
7979

8080
# libbpf build flags:
8181
# CFLAGS = -g -O2 -Wall -fpie
82-
CFLAGS ?= -g -O2 -Werror -Wall -std=gnu89 # default CFLAGS
83-
LDFLAGS ?= -fuse-ld=lld
82+
CFLAGS ?= -g -O2 -Werror -Wall -std=gnu89 -fpic # default CFLAGS
83+
LDFLAGS ?= -fuse-ld=ld
8484

8585
# sanitizer config:
8686
ENABLE_ASAN := no

0 commit comments

Comments
 (0)