Skip to content

Commit 49828c2

Browse files
authored
[Fuchsia] Bump minimal OS X target to 11.0 (#169568)
libcxx requires minimal macOS 11 to build. This patch bumps the minimal OS X target in Fuchsia's cmake cache file to 11.0 to satisfy this requirement.
1 parent 9bf78ab commit 49828c2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

clang/cmake/caches/Fuchsia-stage2.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET default CACHE STRING "")
5858

5959
set(CMAKE_BUILD_TYPE Release CACHE STRING "")
6060
if (APPLE)
61-
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "")
61+
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
6262
elseif(WIN32)
6363
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded" CACHE STRING "")
6464
endif()
@@ -83,7 +83,7 @@ if(APPLE)
8383
set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "")
8484
set(LIBCXX_HARDENING_MODE "none" CACHE STRING "")
8585
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
86-
set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "")
86+
set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "")
8787
endif()
8888

8989
if(WIN32 OR LLVM_WINSYSROOT)

clang/cmake/caches/Fuchsia.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ set(LLVM_ENABLE_ASSERTIONS ON CACHE BOOL "")
9797
set(LLVM_ENABLE_BACKTRACES ON CACHE BOOL "")
9898
set(CMAKE_BUILD_TYPE Release CACHE STRING "")
9999
if(APPLE)
100-
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "")
100+
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "")
101101
elseif(WIN32)
102102
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded" CACHE STRING "")
103103
endif()
@@ -140,7 +140,7 @@ else()
140140
set(SANITIZER_TEST_CXX "libc++" CACHE STRING "")
141141
set(SANITIZER_TEST_CXX_INTREE ON CACHE BOOL "")
142142
set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
143-
set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "")
143+
set(RUNTIMES_CMAKE_ARGS "-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0;-DCMAKE_OSX_ARCHITECTURES=arm64|x86_64" CACHE STRING "")
144144
endif()
145145

146146
if(BOOTSTRAP_CMAKE_SYSTEM_NAME)

0 commit comments

Comments
 (0)