diff options
| author |  Greg Estren <gregce@google.com> | 2015-10-27 21:28:33 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2015-10-28 16:02:23 +0000 |
| commit | c0806489d467ed4bed8478e6cc0039db200669ed (patch) | |
| tree | 99a7cde50038ec543ed244803e6641bd91a75437 /src/main/java/com/google/devtools/build | |
| parent | 955a23aa730d8b397ac6684c06fd657f8d75b0bf (diff) | |
Rollback of commit c1e4243dbefc57909feff4ebb19975f151fa6391.
*** Reason for rollback ***
Breaking O(150) tests on the blaze-2015.10.27-1 nightly TGP []
*** Original change description ***
Make -DNS_BLOCK_ASSERTIONS=1 by default when c=opt on objc builds.
--
MOS_MIGRATED_REVID=106435189
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java index f180044a05..abeccdc0fe 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java @@ -44,8 +44,9 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { "-D_GLIBCPP_CONCEPT_CHECKS"); @VisibleForTesting - static final ImmutableList<String> OPT_COPTS = ImmutableList.of("-Os", "-DNDEBUG=1", - "-Wno-unused-variable", "-Winit-self", "-Wno-extra", "-DNS_BLOCK_ASSERTIONS=1"); + static final ImmutableList<String> OPT_COPTS = + ImmutableList.of( + "-Os", "-DNDEBUG=1", "-Wno-unused-variable", "-Winit-self", "-Wno-extra"); private static final String XCODE_VERSION_ENV_NAME = "XCODE_VERSION_OVERRIDE"; /** |