citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

ci: Only use Linux clang for app image build. (#7244) 

* ci: Only use Linux clang for app image build.

* build: Re-add -Wno-attributes for GCC 11.
This commit is contained in:
Steveice10 2023-12-12 09:48:06 -08:00 committed by GitHub
parent 60584e861d
commit 9a6d15ab74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.ci/linux.sh
View File

@ -1,13 +1,15 @@
#!/bin/sh -ex #!/bin/bash -ex
if [ "$TARGET" = "appimage" ]; then
export COMPILER_FLAGS=(-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=/etc/bin/ld.lld)
fi
mkdir build && cd build mkdir build && cd build
cmake .. -G Ninja \ cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER=clang++ \ "${COMPILER_FLAGS[@]}" \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_LINKER=/etc/bin/ld.lld \
-DENABLE_QT_TRANSLATION=ON \ -DENABLE_QT_TRANSLATION=ON \
-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \ -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \

6
src/CMakeLists.txt
View File

@ -124,6 +124,12 @@ else()
add_compile_options("-stdlib=libc++") add_compile_options("-stdlib=libc++")
endif() endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
# GCC may warn when it ignores attributes like maybe_unused,
# which is a problem for older versions (e.g. GCC 11).
add_compile_options("-Wno-attributes")
endif()
if (MINGW) if (MINGW)
add_definitions(-DMINGW_HAS_SECURE_API) add_definitions(-DMINGW_HAS_SECURE_API)
if (COMPILE_WITH_DWARF) if (COMPILE_WITH_DWARF)