aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
diff options
context:
space:
mode:
authorGravatar Cal Peyser <cpeyser@google.com>2017-01-12 20:00:41 +0000
committerGravatar Marcel Hlopko <hlopko@google.com>2017-01-13 10:57:24 +0000
commit748bbef68037ae57f973bdfe4405b3ccc3791574 (patch)
treeb4df355b3919132b0e216d9d71bc22820984a404 /src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
parentde501a50f3ca9164322b53c2d597e8d1052e1663 (diff)
All headers in modules arising from an experimental_objc_library are compiled
(as they are for objc_library). This allows for swift/objc interop with experimental_objc_library, since swift imports require compiled headers. -- PiperOrigin-RevId: 144353367 MOS_MIGRATED_REVID=144353367
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
index 43de8b409d..9bdff8b554 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibraryHelper.java
@@ -1300,7 +1300,8 @@ public final class CcLibraryHelper {
publicHeaders.getHeaders(),
collectModuleMaps(),
additionalExportedHeaders,
- featureConfiguration.isEnabled(CppRuleClasses.HEADER_MODULES),
+ featureConfiguration.isEnabled(CppRuleClasses.HEADER_MODULES)
+ || featureConfiguration.isEnabled(CppRuleClasses.COMPILE_ALL_MODULES),
featureConfiguration.isEnabled(CppRuleClasses.MODULE_MAP_HOME_CWD),
featureConfiguration.isEnabled(CppRuleClasses.GENERATE_SUBMODULES),
!featureConfiguration.isEnabled(CppRuleClasses.MODULE_MAP_WITHOUT_EXTERN_MODULE));