Allow feature configuration and cc toolchain to be None without crashing PiperOrigin-RevId: 403084297
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index 77328a0..5a05291 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -615,6 +615,8 @@ Artifact resolvedSymlinkDynamicLibrary = null; Artifact resolvedSymlinkInterfaceLibrary = null; if (dynamicLibrary != null + && featureConfiguration != null + && ccToolchainProvider != null && !featureConfiguration .getFeatureConfiguration() .isEnabled(CppRuleClasses.TARGETS_WINDOWS)) { @@ -644,6 +646,8 @@ } } if (interfaceLibrary != null + && featureConfiguration != null + && ccToolchainProvider != null && !featureConfiguration .getFeatureConfiguration() .isEnabled(CppRuleClasses.TARGETS_WINDOWS)) {