ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-20 10:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly quote CMAKE_CXX_FLAGS with spaces

Browse Source
This commit is contained in:
Nicholas Dudfield
2025-08-18 19:41:21 +07:00
parent 4755a37cad
commit 60df462bc2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/actions/xahau-ga-build/action.yml vendored
View File

@@ -95,25 +95,27 @@ runs:
# Configure C++ standard library if specified # Configure C++ standard library if specified
# libstdcxx used for clang-14/16 to work around missing lexicographical_compare_three_way in libc++ # libstdcxx used for clang-14/16 to work around missing lexicographical_compare_three_way in libc++
# libcxx can be used with clang-17+ which has full C++20 support # libcxx can be used with clang-17+ which has full C++20 support
STDLIB_ARGS="" # Configure C++ standard library and toolchain
if [ "${{ inputs.stdlib }}" = "libstdcxx" ]; then if [ "${{ inputs.stdlib }}" = "libstdcxx" ]; then
# Add gcc-toolchain flag if specified (for Clang to use specific GCC version headers) # Add gcc-toolchain flag if specified (for Clang to use specific GCC version headers)
if [ -n "${{ inputs.clang_gcc_toolchain }}" ]; then if [ -n "${{ inputs.clang_gcc_toolchain }}" ]; then
# Use gcc-install-dir to point to specific GCC version # Use gcc-install-dir to point to specific GCC version
# This ensures Clang uses the right headers even with multiple GCC versions installed # This ensures Clang uses the right headers even with multiple GCC versions installed
STDLIB_ARGS="-DCMAKE_CXX_FLAGS='-stdlib=libstdc++ --gcc-install-dir=/usr/lib/gcc/x86_64-linux-gnu/${{ inputs.clang_gcc_toolchain }}'" CMAKE_CXX_FLAGS="-stdlib=libstdc++ --gcc-install-dir=/usr/lib/gcc/x86_64-linux-gnu/${{ inputs.clang_gcc_toolchain }}"
else else
STDLIB_ARGS="-DCMAKE_CXX_FLAGS=-stdlib=libstdc++" CMAKE_CXX_FLAGS="-stdlib=libstdc++"
fi fi
elif [ "${{ inputs.stdlib }}" = "libcxx" ]; then elif [ "${{ inputs.stdlib }}" = "libcxx" ]; then
STDLIB_ARGS="-DCMAKE_CXX_FLAGS=-stdlib=libc++" CMAKE_CXX_FLAGS="-stdlib=libc++"
else
CMAKE_CXX_FLAGS=""
fi fi
# Run CMake configure # Run CMake configure
cmake .. \ cmake .. \
-G "${{ inputs.generator }}" \ -G "${{ inputs.generator }}" \
$CCACHE_ARGS \ $CCACHE_ARGS \
$STDLIB_ARGS \ ${CMAKE_CXX_FLAGS:+-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS"} \
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
-DCMAKE_BUILD_TYPE=${{ inputs.configuration }} -DCMAKE_BUILD_TYPE=${{ inputs.configuration }}