Skip to content

Commit 4966703

Browse files
Fix for building with Carthage and Xcode 12 (#2104)
* Fix for building with Carthage and Xcode 12 * Remove ONLY_ACTIVE_ARCHS from travis config
1 parent 16f7c13 commit 4966703

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ before_install:
1111
script:
1212
- set -o pipefail
1313
- xcodebuild -version
14-
- xcodebuild -project Eureka.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty
14+
- xcodebuild -project Eureka.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug test | xcpretty

Eureka.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,7 @@
726726
DYLIB_CURRENT_VERSION = 1;
727727
DYLIB_INSTALL_NAME_BASE = "@rpath";
728728
ENABLE_BITCODE = YES;
729+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
729730
INFOPLIST_FILE = Source/Info.plist;
730731
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
731732
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -750,6 +751,7 @@
750751
DYLIB_CURRENT_VERSION = 1;
751752
DYLIB_INSTALL_NAME_BASE = "@rpath";
752753
ENABLE_BITCODE = YES;
754+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
753755
INFOPLIST_FILE = Source/Info.plist;
754756
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
755757
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

0 commit comments

Comments
 (0)