diff options
| author |  twerth <twerth@google.com> | 2017-10-24 13:12:13 +0200 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2017-10-24 14:59:32 +0200 |
| commit | 5f5e2b471cef3fdb5e4998c7947cbd657305a48f (patch) | |
| tree | 0e304834a08c9d9ae997d77cc9ee9a4d3574f9ba /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | |
| parent | 7414b873105a2e0435267d5b863caa7df0d57e38 (diff) | |
Automated rollback of commit e9b10399f6a148a3d20442f2c5020b05fa891873.
*** Reason for rollback ***
Breaks ~2k ios targets, see b/68179560
*** Original change description ***
Move hard-coded compilation-mode-specific flags in ObjcConfiguration.
PiperOrigin-RevId: 173239463
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | 4 |
1 files changed, 2 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 cd8d9944e4..b3f0f6abd4 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 @@ -40,7 +40,7 @@ import javax.annotation.Nullable; public class ObjcConfiguration extends BuildConfiguration.Fragment { @VisibleForTesting static final ImmutableList<String> DBG_COPTS = - ImmutableList.of("-O0", "-DDEBUG", "-fstack-protector", "-fstack-protector-all", "-g"); + ImmutableList.of("-O0", "-DDEBUG=1", "-fstack-protector", "-fstack-protector-all", "-g"); @VisibleForTesting static final ImmutableList<String> GLIBCXX_DBG_COPTS = @@ -50,7 +50,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { @VisibleForTesting static final ImmutableList<String> OPT_COPTS = ImmutableList.of( - "-Os", "-DNDEBUG", "-Wno-unused-variable", "-Winit-self", "-Wno-extra"); + "-Os", "-DNDEBUG=1", "-Wno-unused-variable", "-Winit-self", "-Wno-extra"); private final DottedVersion iosSimulatorVersion; private final String iosSimulatorDevice; |