From 0cfc48479eeba37185b3ec187277ef6bf413eb8f Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 22 May 2019 11:02:20 -0500 Subject: [PATCH] macos32: Lock to 10.11 for build machine. 32bit macos has been deprectated and 10.13 does not seem have i386 libraries anymore. --- GNUmakefile | 1 + vm/Config.macosx.x86.32 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e69c1781f7..babefb19e9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -14,6 +14,7 @@ ifdef CONFIG endif XCODE_PATH ?= /Applications/Xcode.app + MACOSX_32_SDK ?= MacOSX10.11.sdk MACOSX_SDK ?= MacOSX10.13.sdk include $(CONFIG) diff --git a/vm/Config.macosx.x86.32 b/vm/Config.macosx.x86.32 index d7e5edc6b8..47a9473601 100644 --- a/vm/Config.macosx.x86.32 +++ b/vm/Config.macosx.x86.32 @@ -2,5 +2,5 @@ include vm/Config.macosx include vm/Config.x86.32 # The last SDK to support x86 is 10.13 -CFLAGS += --sysroot=$(XCODE_PATH)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$(MACOSX_SDK) -CXXFLAGS += --sysroot=$(XCODE_PATH)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$(MACOSX_SDK) +CFLAGS += --sysroot=$(XCODE_PATH)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$(MACOSX_32_SDK) +CXXFLAGS += --sysroot=$(XCODE_PATH)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/$(MACOSX_32_SDK) -- 2.34.1