1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index 568f418ad5..9b1417f003 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -240,6 +240,12 @@ public final class CppConfiguration extends BuildConfiguration.Fragment {
       linkoptsBuilder.add("-Wl,--eh-frame-hdr");
     }
 
+    if (cppOptions.getLipoMode() != LipoMode.OFF
+        && !cppOptions.convertLipoToThinLto
+        && !cppOptions.allowLipo) {
+      throw new InvalidConfigurationException("LIPO is disallowed");
+    }
+
     return new CppConfiguration(
         params.crosstoolTop,
         params.crosstoolFile,