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 32ce7b7f51194276bc5524056c6838d3e756c5f9..ff1514a71634214d612855f66c2c716334887434 100644 (file)
--- 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 967a5482872ddd2d4234bc0951b344c540f1056f..267b056ea7a6e4661a59f533bbeb052bf28769fe 100644 (file)
--- 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 ca9cc43f7a10c88d8d65488b2d549f6759281d8c..8c22e0a71662bf5a72e2f406e13b1c3d6aa9ca75 100644 (file)
--- 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 5677797127f09f9650e08819eeb3fa85aa27e9d0..f069b89c12dd36aea9134b2db7ebbcb0d9d08a22 100644 (file)
--- a/contrib/macdeploy/Info.plist.in
+++ b/contrib/macdeploy/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
   <key>LSMinimumSystemVersion</key>
-  <string>11</string>
+  <string>10.14</string>
 
   <key>LSArchitecturePriority</key>
   <array>