Skip to content

Commit

Permalink
Further cleanup of macOS build setup
Browse files Browse the repository at this point in the history
I don't think we need force_cpusubtype_ALL at this point or stdlib; CMake
build runs into the same problem with stdlib flag as make so it's easier
to just remove it.

We do need macOS version setting, both to ensure a reasonable binary target,
and because we use an API that's deprecated in macOS 13.
  • Loading branch information
zeux committed Jun 11, 2024
1 parent 34fa54c commit 88e27b1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,10 @@ else()

if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_compile_options(
-force_cpusubtype_ALL
-mmacosx-version-min=10.7
-stdlib=libc++
)
add_link_options(
-force_cpusubtype_ALL
-mmacosx-version-min=10.7
-stdlib=libc++
"SHELL:-framework CoreFoundation"
"SHELL:-framework CoreServices"
)
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ CCFLAGS+=-DUSE_NEON
endif

ifeq ($(shell uname),Darwin)
CCFLAGS+=-force_cpusubtype_ALL -mmacosx-version-min=10.7
CXXFLAGS+=-stdlib=libc++
CCFLAGS+=-mmacosx-version-min=10.7
LDFLAGS+=-mmacosx-version-min=10.7
LDFLAGS+=-framework CoreFoundation -framework CoreServices
else
Expand Down

0 comments on commit 88e27b1

Please sign in to comment.