From f8e77e0fe6bf014c1ab70051ee050e5f360bdeee Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 14 Aug 2017 07:54:10 -0400 Subject: [PATCH] Add Apple Watch and TV to Travis testing --- TestScripts/setenv-ios.sh | 5 +++++ setenv-ios.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh index 955f76bc..b4604fa0 100755 --- a/TestScripts/setenv-ios.sh +++ b/TestScripts/setenv-ios.sh @@ -208,6 +208,11 @@ if [ "$IOS_ARCH" == "arm64" ]; then IOS_FLAGS=-miphoneos-version-min=7 fi +# Yet another ARM64 fixup. +if [ "$APPLE_SDK" == "AppleTVOS" ]; then + IOS_FLAGS="" +fi + # ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 if [ "$IOS_ARCH" == "x86_64" ]; then IOS_FLAGS=-miphoneos-version-min=8 diff --git a/setenv-ios.sh b/setenv-ios.sh index 955f76bc..b4604fa0 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -208,6 +208,11 @@ if [ "$IOS_ARCH" == "arm64" ]; then IOS_FLAGS=-miphoneos-version-min=7 fi +# Yet another ARM64 fixup. +if [ "$APPLE_SDK" == "AppleTVOS" ]; then + IOS_FLAGS="" +fi + # ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 if [ "$IOS_ARCH" == "x86_64" ]; then IOS_FLAGS=-miphoneos-version-min=8