diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-12-31 16:06:10 +1100 |
|---|---|---|
| committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-12-31 16:06:10 +1100 |
| commit | aa1d559854a01bbd4cbc6e5d27ca075ab2d9a7c0 (patch) | |
| tree | 25b948732e04b96c0735ee5291008746bc72062d | |
| parent | 6076746ff3fa76e63d953d41885a7d2f843a780e (diff) | |
okay libsystemd doesn't compile on clang right now :(
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rw-r--r-- | source/CMakePresets.json | 2 | ||||
| -rw-r--r-- | triplets/x64-linux-mixed.cmake | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c14a3d..4211cbd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/source/CMakePresets.json b/source/CMakePresets.json index 7efdc23..a2c59e9 100644 --- a/source/CMakePresets.json +++ b/source/CMakePresets.json @@ -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", diff --git a/triplets/x64-linux-mixed.cmake b/triplets/x64-linux-mixed.cmake index 5e93dff..545d6f0 100644 --- a/triplets/x64-linux-mixed.cmake +++ b/triplets/x64-linux-mixed.cmake @@ -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) |