Skip to content

Commit 75375c9

Browse files
authored
Merge pull request #178 from sx-aurora-dev/feature/jenkins
Feature/jenkins
2 parents 28ab529 + 89c0c36 commit 75375c9

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Jenkinsfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ pipeline {
99
// Job pool
1010
COMPILE_THREADS = 24
1111
LINK_THREADS = 8
12-
// Need to use either gcc-10 or clang to compile recent llvm
13-
CC = "/opt/nec/nosupport/llvm-ve-1.16.0/bin/clang"
14-
CXX = "/opt/nec/nosupport/llvm-ve-1.16.0/bin/clang++"
1512
REPO_URL = sh(
1613
returnStdout: true,
1714
script: "echo ${env.GIT_URL} | sed -e 's:/[^/]*\$::'").trim()
@@ -44,8 +41,7 @@ pipeline {
4441
dir('llvm-dev') {
4542
sh """
4643
make clean
47-
CC="${CC}" CXX="${CXX}" make \
48-
SRCDIR=${TOP}/llvm-project CMAKE=${CMAKE} \
44+
make SRCDIR=${TOP}/llvm-project CMAKE=${CMAKE} \
4945
COMPILE_THREADS=${COMPILE_THREADS} \
5046
LINK_THREADS=${LINK_THREADS} cmake build
5147
"""
@@ -107,11 +103,9 @@ pipeline {
107103
}
108104
dir('vml/build') {
109105
sh """
110-
# Use sed since CMakeLists.txt does not use option command.
111-
sed -e 's:linux/libclang_rt.builtins-ve.a:ve-unknown-linux-gnu/libclang_rt.builtins.a:' -i ../CMakeLists.txt
112106
${CMAKE} -DCMAKE_BUILD_TYPE="Debug" \
113107
-DLLVM_DIR=${TOP}/llvm-dev/install/lib/cmake/llvm \
114-
-DCLANG_RUNTIME=${TOP}/llvm-dev/install/lib/clang/14.0.0/lib/ve-unknown-linux-gnu/libclang_rt.builtins.a \
108+
-DCLANG_RUNTIME=${TOP}/llvm-dev/install/lib/clang/15.0.0/lib/ve-unknown-linux-gnu/libclang_rt.builtins.a \
115109
-DNCC_VERSION=-3.0.6 ..
116110
# make -j often crash
117111
make -j${COMPILE_THREADS}

0 commit comments

Comments
 (0)