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

Commit a223b1cf authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Darwin: Use the same `ar` as Soong"

parents e4d5e08c 6a54a9f1

core/combo/HOST_darwin-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ endef 
# HOST_TOOLCHAIN_ROOT is a Darwin-specific define

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)



$(combo_2nd_arch_prefix)HOST_AR := $(AR)

$(combo_2nd_arch_prefix)HOST_AR := $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/bin/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_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)

core/combo/HOST_darwin-x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ endef 
# HOST_TOOLCHAIN_ROOT is a Darwin-specific define

HOST_TOOLCHAIN_FOR_CLANG := $(HOST_TOOLCHAIN_ROOT)



HOST_AR := $(AR)

HOST_AR := $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar



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

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