evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

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

2
source/CMakePresets.json
View File

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

2
triplets/x64-linux-mixed.cmake
View File

@ -3,7 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Linux) 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-") if(PORT MATCHES "discord-")
set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic)