1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java
index dc9f938902..147a7773c1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosSdkCommands.java
@@ -61,6 +61,8 @@ public class IosSdkCommands {
           .put("GCC_WARN_UNUSED_VARIABLE", "-Wunused-variable")
           .build();
 
+  static final ImmutableList<String> DEFAULT_COMPILER_FLAGS = ImmutableList.of("-DOS_IOS");
+
   static final ImmutableList<String> DEFAULT_LINKER_FLAGS = ImmutableList.of("-ObjC");
 
   private IosSdkCommands() {
@@ -92,7 +94,7 @@ public class IosSdkCommands {
     return parents.build();
   }
 
-  public static List<String> commonLinkAndCompileArgsForClang(
+  public static List<String> commonLinkAndCompileFlagsForClang(
       ObjcProvider provider, ObjcConfiguration configuration) {
     ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();
     if (Platform.forArch(configuration.getIosCpu()) == Platform.SIMULATOR) {
@@ -120,14 +122,16 @@ public class IosSdkCommands {
         .build();
   }
 
-  public static Iterable<String> compileArgsForClang(ObjcConfiguration configuration) {
+  public static Iterable<String> compileFlagsForClang(ObjcConfiguration configuration) {
     return Iterables.concat(
         DEFAULT_WARNINGS.values(),
-        platformSpecificCompileArgsForClang(configuration)
+        platformSpecificCompileFlagsForClang(configuration),
+        DEFAULT_COMPILER_FLAGS
     );
   }
 
-  private static List<String> platformSpecificCompileArgsForClang(ObjcConfiguration configuration) {
+  private static List<String> platformSpecificCompileFlagsForClang(
+      ObjcConfiguration configuration) {
     switch (Platform.forArch(configuration.getIosCpu())) {
       case DEVICE:
         return ImmutableList.of();