Fix CMAKE_C/CXX_FLAGS overriding problem and removing the flag for NS…

…ym job (#148)
awslabs · May 10, 2024 · 5b058cd · 5b058cd
1 parent 1a3784b
commit 5b058cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/NSym/scripts/build_aarch64.sh b/NSym/scripts/build_aarch64.sh
@@ -13,8 +13,6 @@ mkdir -p build_src/aarch64
 cd build_src/aarch64
 export LDFLAGS="-fuse-ld=lld"
 cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-      -DCMAKE_CXX_FLAGS="-ggdb" \
-      -DCMAKE_C_FLAGS="-ggdb" \
       -DBUILD_LIBSSL=OFF \
       -DKEEP_ASM_LOCAL_SYMBOLS=1 \
       -DCMAKE_TOOLCHAIN_FILE=../../scripts/build_aarch64.cmake \

diff --git a/SAW/scripts/aarch64/build_llvm.sh b/SAW/scripts/aarch64/build_llvm.sh
@@ -20,8 +20,8 @@ cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
       -DCMAKE_C_FLAGS="-ggdb" \
       -DBUILD_LIBSSL=OFF \
       -DCMAKE_TOOLCHAIN_FILE=../../scripts/aarch64/build_llvm.cmake \
-      -DCMAKE_C_FLAGS="--target=${TARGET} -I/usr/aarch64-linux-gnu/include -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu" \
-      -DCMAKE_CXX_FLAGS="--target=${TARGET} -I/usr/aarch64-linux-gnu/include -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu" \
+      -DCMAKE_C_FLAGS="-ggdb --target=${TARGET} -I/usr/aarch64-linux-gnu/include -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu" \
+      -DCMAKE_CXX_FLAGS="-ggdb --target=${TARGET} -I/usr/aarch64-linux-gnu/include -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu" \
       -DCMAKE_ASM_FLAGS="--target=${TARGET} -I/usr/aarch64-linux-gnu/include -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu" \
       -DCMAKE_CXX_LINK_FLAGS="-Wl,--unresolved-symbols=ignore-in-object-files -I/usr/aarch64-linux-gnu/include -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu"  \
       ../../../src