Skip to content

Commit 0e29dcf

Browse files
committed
Fixed arm llvm v20
1 parent a65a59d commit 0e29dcf

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
matrix:
7171
osversion: [ubuntu-22.04]
7272
stdlib: [libc++]
73-
sanitizer: [null]
73+
sanitizer: [null, 'Address', 'Thread', 'Undefined']
7474
steps:
7575
- uses: AutoModality/action-clean@v1
7676
- uses: actions/checkout@v2

build_ubuntu-arm64.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ cd /build_dir/llvm-project
1717
rm -rf ./build
1818
mkdir build
1919

20-
local CXX_FLAGS=""
21-
local LINKER_FLAGS=""
22-
local ADDITIONAL_FLAGS=""
20+
CXX_FLAGS=""
21+
LDFLAGS=""
22+
ADDITIONAL_FLAGS=""
2323
if [ "$STDLIB" == "libc++" ]; then
24-
CXX_FLAGS="-std=c++23 -stdlib=libc++"
25-
LINKER_FLAGS="-lc++"
24+
CXXFLAGS="-stdlib=libc++ -std=c++23"
25+
LDFLAGS="-lc++"
2626
elif [ "$STDLIB" == "stdlibc++" ]; then
27-
CXX_FLAGS="-std=c++23"
28-
LINKER_FLAGS=""
27+
CXXFLAGS="-std=c++23"
28+
LDFLAGS=""
2929
else
3030
echo "Error: STDLIB env not set to either libc++ or stdlibc++."
3131
exit 1
@@ -35,12 +35,12 @@ if [ ! -z ${ENABLE_SANITIZER+x} ]; then
3535
ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_USE_SANITIZER=${ENABLE_SANITIZER}"
3636
fi
3737

38-
if [ ! -z "${CXX_FLAGS}" ]; then
39-
ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DCMAKE_CXX_FLAGS=\"${CXX_FLAGS}\""
38+
if [ ! -z "${CXXFLAGS}" ]; then
39+
export CXXFLAGS
4040
fi
4141

42-
if [ ! -z "${LINKER_FLAGS}" ]; then
43-
ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DCMAKE_EXE_LINKER_FLAGS=\"${LINKER_FLAGS}\""
42+
if [ ! -z "${LDFLAGS}" ]; then
43+
export LDFLAGS
4444
fi
4545

4646
cmake -G Ninja -S llvm -B build -DCMAKE_BUILD_TYPE=Release \

llvm-project

0 commit comments

Comments
 (0)