diff options
| author |  Dave MacLachlan <dmaclach@google.com> | 2015-09-23 18:15:32 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-09-24 14:18:51 +0000 |
| commit | eadaf50155999586975584fefdf29526217c7b3b (patch) | |
| tree | a925a0c37982d30f18bc6e6565b604e4fd70ebaf /src/objc_tools | |
| parent | df0531fad8fc0288c21f5672aa59907362ae0ff5 (diff) | |
Turns bitcode off for the time being to make the Xcode project output match what is being produced by bazel build.
--
MOS_MIGRATED_REVID=103763760
Diffstat (limited to 'src/objc_tools')
| -rw-r--r-- | src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java index 6e69f6fb19..e8825542a5 100644 --- a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java +++ b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/XcodeprojGeneration.java @@ -405,6 +405,10 @@ public class XcodeprojGeneration { projBuildConfigMap.put("GCC_VERSION", "com.apple.compilers.llvm.clang.1_0"); projBuildConfigMap.put("CODE_SIGN_IDENTITY[sdk=iphoneos*]", "iPhone Developer"); + // Disable bitcode for now. + // TODO(bazel-team): Need to re-enable once we have real Xcode 7 support. + projBuildConfigMap.put("ENABLE_BITCODE", "NO"); + for (XcodeprojBuildSetting projectSetting : control.getBuildSettingList()) { projBuildConfigMap.put(projectSetting.getName(), projectSetting.getValue()); } @@ -491,6 +495,7 @@ public class XcodeprojGeneration { "INFOPLIST_FILE", "$(WORKSPACE_ROOT)/" + targetControl.getInfoplist()); } + // Double-quotes in copt strings need to be escaped for XCode. if (targetControl.getCoptCount() > 0) { List<String> escapedCopts = Lists.transform( |