From 636ed303a312d6c313cce32c17194e6c21ec26da Mon Sep 17 00:00:00 2001 From: Cocoa Date: Sun, 4 Aug 2024 19:51:41 +0100 Subject: [PATCH] fix zig Signed-off-by: Cocoa --- cc_toolchain/aarch64-linux-musl.cmake | 2 +- cc_toolchain/riscv64-linux-musl.cmake | 2 +- cc_toolchain/zig.toolchain.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cc_toolchain/aarch64-linux-musl.cmake b/cc_toolchain/aarch64-linux-musl.cmake index 286dfdef..1cec0884 100644 --- a/cc_toolchain/aarch64-linux-musl.cmake +++ b/cc_toolchain/aarch64-linux-musl.cmake @@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR aarch64) set(TARGET_SYS aarch64-linux-musl) include(${CMAKE_CURRENT_LIST_DIR}/zig.toolchain.cmake) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c++17") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/cc_toolchain/riscv64-linux-musl.cmake b/cc_toolchain/riscv64-linux-musl.cmake index b251de5a..95f3e9dc 100644 --- a/cc_toolchain/riscv64-linux-musl.cmake +++ b/cc_toolchain/riscv64-linux-musl.cmake @@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR riscv64) set(TARGET_SYS riscv64-linux-musl) include(${CMAKE_CURRENT_LIST_DIR}/zig.toolchain.cmake) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -std=c++17") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/cc_toolchain/zig.toolchain.cmake b/cc_toolchain/zig.toolchain.cmake index 25ce803b..6a3c40b6 100644 --- a/cc_toolchain/zig.toolchain.cmake +++ b/cc_toolchain/zig.toolchain.cmake @@ -89,7 +89,7 @@ if(TARGET_SYS AND NOT ZIG_INIT) set(CMAKE_CXX_COMPILER_FORCED 1) set(CMAKE_CXX_COMPILER_ID_RUN TRUE) - set(CMAKE_CXX_COMPILER ${ZIG_TOOLCHAIN_PATH} c++ "-target ${TARGET_SYS} -fPIC") + set(CMAKE_CXX_COMPILER ${ZIG_TOOLCHAIN_PATH} c++ "-target ${TARGET_SYS} -fPIC -std=c++17") set(CMAKE_CXX_COMPILER_ID "zig") set(CMAKE_CXX_COMPILER_VERSION 12.0) set(CMAKE_CXX_COMPILER_TARGET ${TARGET_SYS})