Skip to content

Commit d424c8e

Browse files
committed
Allow Mac builds to use whatever the installed SDK is. Bump the minimum
supported target up to 10.9 (Mavericks).
1 parent bd18c0e commit d424c8e

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

build.macos32x86/common/Makefile.flags

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ else # Allow Makefile to set specific SDK
1414
override SDK:=$(realpath $(addprefix $(SDKsDIR)/, $(SDK)))
1515
endif
1616
ifeq ($(strip $(SDK)),)
17-
$(error could not find a valid SDK)
17+
ifeq ($(wildcard $(realpath $(addprefix $(SDKsDIR)/,MacOSX.sdk))),)
18+
$(error could not find a valid SDK)
19+
else
20+
SDK:=$(realpath $(addprefix $(SDKsDIR)/,MacOSX.sdk))
21+
endif
1822
endif
1923
TARGET_ARCH:=i386
2024
ifeq ($(TARGET_VERSION_MIN),) # Allow Makefile to set TARGET_VERSION_MIN
21-
TARGET_VERSION_MIN:=10.7
25+
TARGET_VERSION_MIN:=10.9
2226
endif
2327

2428
# Determine where to install plugins in the .app bundle using the Squeak

build.macos64ARMv8/common/Makefile.flags

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ else # Allow Makefile to set specific SDK
1414
override SDK:=$(realpath $(addprefix $(SDKsDIR)/, $(SDK)))
1515
endif
1616
ifeq ($(strip $(SDK)),)
17-
$(error could not find a valid SDK)
17+
ifeq ($(wildcard $(realpath $(addprefix $(SDKsDIR)/,MacOSX.sdk))),)
18+
$(error could not find a valid SDK)
19+
else
20+
SDK:=$(realpath $(addprefix $(SDKsDIR)/,MacOSX.sdk))
21+
endif
1822
endif
1923
TARGET_ARCH:=arm64
2024
#TARGET_CPU:=apple-a12

build.macos64x64/common/Makefile.flags

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ else # Allow Makefile to set specific SDK
1414
override SDK:=$(realpath $(addprefix $(SDKsDIR)/, $(SDK)))
1515
endif
1616
ifeq ($(strip $(SDK)),)
17-
$(error could not find a valid SDK)
17+
ifeq ($(wildcard $(realpath $(addprefix $(SDKsDIR)/,MacOSX.sdk))),)
18+
$(error could not find a valid SDK)
19+
else
20+
SDK:=$(realpath $(addprefix $(SDKsDIR)/,MacOSX.sdk))
21+
endif
1822
endif
1923
TARGET_ARCH:=x86_64
2024
ifeq ($(TARGET_VERSION_MIN),) # Allow Makefile to set TARGET_VERSION_MIN
21-
TARGET_VERSION_MIN:=10.7
25+
TARGET_VERSION_MIN:=10.9
2226
endif
2327

2428
# Determine where to install plugins in the .app bundle using the Squeak

0 commit comments

Comments
 (0)