From: tobtoht Date: Tue, 3 Oct 2023 18:16:09 +0000 (+0200) Subject: guix: downgrade back to clang-toolchain-10 X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=a3ea336c24ff4afc127f8564986c99cbef62585e;p=gamesguru%2Ffeather.git guix: downgrade back to clang-toolchain-10 11 causes an undiagnosed runtime failure --- diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk index 32ce7b7f..ff1514a7 100644 --- a/contrib/depends/hosts/darwin.mk +++ b/contrib/depends/hosts/darwin.mk @@ -1,4 +1,4 @@ -OSX_MIN_VERSION=11.0 +OSX_MIN_VERSION=10.14 OSX_SDK_VERSION=11.0 XCODE_VERSION=12.2 XCODE_BUILD_ID=12B45b diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 967a5482..267b056e 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -116,7 +116,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(BREW OFF) SET(PORT OFF) SET(CMAKE_OSX_SYSROOT "@prefix@/native/SDK") - SET(CMAKE_OSX_DEPLOYMENT_TARGET "11") + SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.14") SET(CMAKE_CXX_STANDARD 17) SET(LLVM_ENABLE_PIC OFF) SET(LLVM_ENABLE_PIE OFF) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index ca9cc43f..8c22e0a7 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -347,5 +347,5 @@ chain for " target " development.")) ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list clang-toolchain-11 binutils ldid)) + (list clang-toolchain-10 binutils ldid)) (else '()))))) diff --git a/contrib/macdeploy/Info.plist.in b/contrib/macdeploy/Info.plist.in index 56777971..f069b89c 100644 --- a/contrib/macdeploy/Info.plist.in +++ b/contrib/macdeploy/Info.plist.in @@ -3,7 +3,7 @@ LSMinimumSystemVersion - 11 + 10.14 LSArchitecturePriority