Skip to content

Commit fddf226

Browse files
linesightclaude
andcommitted
macos: drop Intel Mac support, arm64 only
Delete cef_version_mac.h (CEF 66 x86_64 header, never updated for 146). CMakeLists.txt, common.py, and build_distrib.py all now unconditionally use cef_version_macarm64.h and the cef*_macarm64 CEF directory on macOS. The -mmacosx-version-min is hardcoded to 11.0 (ARM64 minimum). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent d73710d commit fddf226

4 files changed

Lines changed: 7 additions & 126 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ if(NOT CEF_ROOT)
4141
if(WIN32)
4242
set(_cef_glob_pat "${CMAKE_SOURCE_DIR}/build/cef*_win64")
4343
elseif(APPLE)
44-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64")
45-
set(_cef_glob_pat "${CMAKE_SOURCE_DIR}/build/cef*_macarm64")
46-
else()
47-
set(_cef_glob_pat "${CMAKE_SOURCE_DIR}/build/cef*_mac64")
48-
endif()
44+
set(_cef_glob_pat "${CMAKE_SOURCE_DIR}/build/cef*_macarm64")
4945
else()
5046
set(_cef_glob_pat "${CMAKE_SOURCE_DIR}/build/cef*_linux64")
5147
endif()
@@ -75,11 +71,7 @@ set(PYX_STAGE_DIR "${CMAKE_CURRENT_BINARY_DIR}/pyx_stage")
7571
if(WIN32)
7672
set(_cef_ver_header "${SRC_DIR}/version/cef_version_win.h")
7773
elseif(APPLE)
78-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64")
79-
set(_cef_ver_header "${SRC_DIR}/version/cef_version_macarm64.h")
80-
else()
81-
set(_cef_ver_header "${SRC_DIR}/version/cef_version_mac.h")
82-
endif()
74+
set(_cef_ver_header "${SRC_DIR}/version/cef_version_macarm64.h")
8375
else()
8476
set(_cef_ver_header "${SRC_DIR}/version/cef_version_linux.h")
8577
endif()
@@ -218,13 +210,8 @@ elseif(APPLE)
218210
BROWSER_PROCESS
219211
CEFPYTHON_API_H_FILE="cefpython_api_fixed.h"
220212
)
221-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64")
222-
set(_macos_ver_min 11.0)
223-
else()
224-
set(_macos_ver_min 10.9)
225-
endif()
226213
target_link_options(${MODULE_NAME} PRIVATE
227-
-mmacosx-version-min=${_macos_ver_min}
214+
-mmacosx-version-min=11.0
228215
-Wl,-search_paths_first -Wl,-dead_strip
229216
"-F${CEF_ROOT}/bin" "-framework" "Chromium Embedded Framework"
230217
"-Wl,-rpath,@loader_path/"

src/version/cef_version_mac.h

Lines changed: 0 additions & 102 deletions
This file was deleted.

tools/build_distrib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def _read_version():
116116
if sys.platform == "win32":
117117
name = "cef_version_win.h"
118118
elif sys.platform == "darwin":
119-
name = "cef_version_mac.h"
119+
name = "cef_version_macarm64.h"
120120
else:
121121
name = "cef_version_linux.h"
122122
header = os.path.join("src", "version", name)

tools/common.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,8 @@
5151
OS_POSTFIX2 = "win32" if ARCH32 else "win64"
5252
CEF_POSTFIX2 = "windows32" if ARCH32 else "windows64"
5353
elif OS_POSTFIX == "mac":
54-
if platform.machine() == "arm64":
55-
OS_POSTFIX2 = "macarm64"
56-
CEF_POSTFIX2 = "macosarm64"
57-
else:
58-
OS_POSTFIX2 = "mac32" if ARCH32 else "mac64"
59-
CEF_POSTFIX2 = "macosx32" if ARCH32 else "macosx64"
54+
OS_POSTFIX2 = "macarm64"
55+
CEF_POSTFIX2 = "macosarm64"
6056
elif OS_POSTFIX == "linux":
6157
OS_POSTFIX2 = "linux32" if ARCH32 else "linux64"
6258
CEF_POSTFIX2 = "linux32" if ARCH32 else "linux64"
@@ -474,7 +470,7 @@ def get_version_from_command_line_args(caller_script, ignore_error=False):
474470

475471
def get_cefpython_version():
476472
"""Get CEF version from the 'src/version/' directory."""
477-
if OS_POSTFIX == "mac" and platform.machine() == "arm64":
473+
if OS_POSTFIX == "mac":
478474
header_name = "cef_version_macarm64.h"
479475
else:
480476
header_name = "cef_version_" + OS_POSTFIX + ".h"

0 commit comments

Comments
 (0)