Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1199f738 authored by Al Sutton's avatar Al Sutton
Browse files

Fix building on modern versions of Xcode and OS X. 

Add the build options to support the most recent versions of XCode and
add 10.9 to the list of OS X SDKs which the AOSP code can be built with.

Based on patch from https://groups.google.com/d/msg/android-building/kePgJmYBUdM/0C_d1OZflvcJ



Change-Id: I97ffe45d3c54a095952a4ac6accb938623b8fa1e
Signed-off-by: default avatarAl Sutton <al@funkyandroid.com>
parent 652ff716

core/combo/HOST_darwin-x86.mk

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ $(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := $($(combo_2nd_arch_prefix)HO 
$(combo_2nd_arch_prefix)HOST_AR := $(AR)



$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) -DMACOSX_DEPLOYMENT_TARGET=$(mac_sdk_version)

$(combo_2nd_arch_prefix)HOST_GLOBAL_CPPFLAGS += -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)



$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -fPIC -funwind-tables

core/combo/HOST_darwin-x86_64.mk

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ HOST_TOOLCHAIN_FOR_CLANG := $(HOST_TOOLCHAIN_ROOT) 
HOST_AR := $(AR)



HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) -DMACOSX_DEPLOYMENT_TARGET=$(mac_sdk_version)

HOST_GLOBAL_CPPFLAGS += -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1

HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)



HOST_GLOBAL_CFLAGS += -fPIC -funwind-tables

core/combo/mac_version.mk

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ ifndef build_mac_version 


build_mac_version := $(shell sw_vers -productVersion)



mac_sdk_versions_supported :=  10.6 10.7 10.8

mac_sdk_versions_supported :=  10.6 10.7 10.8 10.9

ifneq ($(strip $(MAC_SDK_VERSION)),)

mac_sdk_version := $(MAC_SDK_VERSION)

ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)