Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix iOS/tvOS simulator builds actually being device builds, on arm64 #95

Merged
merged 1 commit into from
Mar 22, 2021
Merged

Fix iOS/tvOS simulator builds actually being device builds, on arm64 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/icu.ios.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IOS_MIN_VERSION=8.0
IOS_MIN_VERSION=10.0

### Delete this when https://github.com/dotnet/runtime/pull/49305 is merged ###
ifeq ($(TARGET_ARCHITECTURE),x64)
Expand Down
12 changes: 6 additions & 6 deletions eng/icu.iossimulator.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
IOS_MIN_VERSION=8.0
IOS_MIN_VERSION=10.0

ifeq ($(TARGET_ARCHITECTURE),x64)
IOS_ARCH=-arch x86_64
IOS_SDK=iphonesimulator
IOS_ICU_HOST=i686-apple-darwin11
IOS_ICU_HOST=i686-apple-darwin
endif
ifeq ($(TARGET_ARCHITECTURE),x86)
IOS_ARCH=-arch i386
IOS_SDK=iphonesimulator
IOS_ICU_HOST=i686-apple-darwin11
IOS_ICU_HOST=i686-apple-darwin
endif
ifeq ($(TARGET_ARCHITECTURE),arm64)
IOS_ARCH=-arch arm64
IOS_SDK=iphonesimulator
IOS_ICU_HOST=arm-apple-darwin
IOS_ICU_HOST=aarch64-apple-darwin
endif

XCODE_DEVELOPER := $(shell xcode-select --print-path)
XCODE_SDK := $(shell xcodebuild -version -sdk $(IOS_SDK) | grep -E '^Path' | sed 's/Path: //')

CONFIGURE_COMPILER_FLAGS += \
CFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ $(IOS_ARCH) -miphoneos-version-min=$(IOS_MIN_VERSION)" \
CXXFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ -I./include/ $(IOS_ARCH) -miphoneos-version-min=$(IOS_MIN_VERSION)" \
CFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ $(IOS_ARCH) -miphonesimulator-version-min=$(IOS_MIN_VERSION)" \
CXXFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ -I./include/ $(IOS_ARCH) -miphonesimulator-version-min=$(IOS_MIN_VERSION)" \
LDFLAGS="-L$(XCODE_SDK)/usr/lib/ -isysroot $(XCODE_SDK) -miphoneos-version-min=$(IOS_MIN_VERSION)" \
CC="$(XCODE_DEVELOPER)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" \
CXX="$(XCODE_DEVELOPER)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
Expand Down
6 changes: 3 additions & 3 deletions eng/icu.tvos.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
TVOS_MIN_VERSION=9.0
TVOS_MIN_VERSION=10.0

### Delete this when https://github.com/dotnet/runtime/pull/49305 is merged ###
ifeq ($(TARGET_ARCHITECTURE),x64)
TVOS_ARCH=x86_64
TVOS_SDK=appletvsimulator
TVOS_ICU_HOST=i686-apple-darwin11
TVOS_ICU_HOST=i686-apple-darwin
endif
ifeq ($(TARGET_ARCHITECTURE),arm64)
TVOS_ARCH=arm64
TVOS_SDK=appletvos
TVOS_ICU_HOST=arm-apple-darwin
TVOS_ICU_HOST=aarch64-apple-darwin
endif

XCODE_DEVELOPER := $(shell xcode-select --print-path)
Expand Down
10 changes: 5 additions & 5 deletions eng/icu.tvossimulator.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
TVOS_MIN_VERSION=9.0
TVOS_MIN_VERSION=10.0

ifeq ($(TARGET_ARCHITECTURE),x64)
TVOS_ARCH=x86_64
TVOS_SDK=appletvsimulator
TVOS_ICU_HOST=i686-apple-darwin11
TVOS_ICU_HOST=i686-apple-darwin
endif
ifeq ($(TARGET_ARCHITECTURE),arm64)
TVOS_ARCH=arm64
TVOS_SDK=appletvsimulator
TVOS_ICU_HOST=arm-apple-darwin
TVOS_ICU_HOST=aarch64-apple-darwin
endif

XCODE_DEVELOPER := $(shell xcode-select --print-path)
XCODE_SDK := $(shell xcodebuild -version -sdk $(TVOS_SDK) | grep -E '^Path' | sed 's/Path: //')

CONFIGURE_COMPILER_FLAGS += \
CFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ -arch $(TVOS_ARCH) -mappletvos-version-min=$(TVOS_MIN_VERSION)" \
CXXFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ -I./include/ -arch $(TVOS_ARCH) -mappletvos-version-min=$(TVOS_MIN_VERSION)" \
CFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ -arch $(TVOS_ARCH) -mappletvsimulator-version-min=$(TVOS_MIN_VERSION)" \
CXXFLAGS="-Oz -fno-exceptions -Wno-sign-compare $(ICU_DEFINES) -isysroot $(XCODE_SDK) -I$(XCODE_SDK)/usr/include/ -I./include/ -arch $(TVOS_ARCH) -mappletvsimulator-version-min=$(TVOS_MIN_VERSION)" \
LDFLAGS="-L$(XCODE_SDK)/usr/lib/ -isysroot $(XCODE_SDK) -mappletvos-version-min=$(TVOS_MIN_VERSION)" \
CC="$(XCODE_DEVELOPER)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" \
CXX="$(XCODE_DEVELOPER)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
Expand Down