X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/a62d09fcbc8ca9da27887e04112ec143e19b1caf..f59164e3d128c7675a4d3934206346a3384e53a5:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index 63558b6d..01d4bda8 100644
--- a/makefile
+++ b/makefile
@@ -381,8 +381,8 @@ $(error Cross-builds currently not allowed on Linux)
 endif
 endif
 
-MAC_OS_X_VERSION_MIN_REQUIRED=101000
-OSX_HOST_VERSION_MIN_STRING=10.10
+MAC_OS_X_VERSION_MIN_REQUIRED=101100
+OSX_HOST_VERSION_MIN_STRING=10.11
 
 ifndef IPHONEOS_DEPLOYMENT_TARGET
 	IOS_VERSION_TARGET_STRING=10.0
@@ -511,10 +511,19 @@ else
 	THUMB_FLAG =
 endif
 
-# even for a crossbuild host build, we want to use the target's latest tzdata as pointed to by latest_tzdata.tar.gz
-ifeq "$(shell test -d $(SDKPATH)/usr/local/share/tz && echo YES )" "YES"
-	export TZDATA:=$(SDKPATH)/usr/local/share/tz/$(shell readlink $(SDKPATH)/usr/local/share/tz/latest_tzdata.tar.gz)
+# even for a crossbuild host build, we want to use the target's latest tzdata as pointed to by latest_tzdata.tar.gz;
+# first try RC_EMBEDDEDPROJECT_DIR (<rdar://problem/28141177>), else SDKPATH.
+ifdef RC_EMBEDDEDPROJECT_DIR
+	ifeq "$(shell test -L $(RC_EMBEDDEDPROJECT_DIR)/TimeZoneData/usr/local/share/tz/latest_tzdata.tar.gz && echo YES )" "YES"
+		export TZDATA:=$(RC_EMBEDDEDPROJECT_DIR)/TimeZoneData/usr/local/share/tz/$(shell readlink $(RC_EMBEDDEDPROJECT_DIR)/TimeZoneData/usr/local/share/tz/latest_tzdata.tar.gz)
+	endif
+endif
+ifndef TZDATA
+	ifeq "$(shell test -L $(SDKPATH)/usr/local/share/tz/latest_tzdata.tar.gz && echo YES )" "YES"
+		export TZDATA:=$(SDKPATH)/usr/local/share/tz/$(shell readlink $(SDKPATH)/usr/local/share/tz/latest_tzdata.tar.gz)
+	endif
 endif
+$(info # RC_EMBEDDEDPROJECT_DIR=$(RC_EMBEDDEDPROJECT_DIR))
 $(info # TZDATA=$(TZDATA))
 
 APPLE_INTERNAL_DIR=/AppleInternal