okay libsystemd doesn't compile on clang right now :(

This commit is contained in:
Kae 2024-12-31 16:06:10 +11:00
parent 6076746ff3
commit aa1d559854
3 changed files with 4 additions and 6 deletions

View File

@ -90,9 +90,9 @@ jobs:
build_linux:
name: Build OpenStarbound Linux x86_64
runs-on: ubuntu-20.04
env:
CC: clang
CXX: clang++
#env:
# CC: clang
# CXX: clang++
steps:
- name: Install Packages

View File

@ -47,8 +47,6 @@
"binaryDir": "${sourceParentDir}/build/linux-release",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_C_COMPILER": "clang",
"CMAKE_CXX_COMPILER": "clang++",
"VCPKG_TARGET_TRIPLET": "x64-linux-mixed",
"CMAKE_INCLUDE_PATH": "${sourceParentDir}/lib/linux/include",
"CMAKE_LIBRARY_PATH": "${sourceParentDir}/lib/linux",

View File

@ -3,7 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
# set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/../toolchains/clang-toolchain.cmake)
if(PORT MATCHES "discord-")
set(VCPKG_LIBRARY_LINKAGE dynamic)