windows_cc_configure: report custom envvars
setup_vc_env_vars() now reports envvars the caller
is interested in.
This is prework to support resource compilation:
to discover the resource compiler's path we need
the exact Windows SDK path (with SDK version)
from `%WindowsSdkVerBinPath%`.
Context: https://github.com/bazelbuild/bazel/issues/8273
Closes #8905.
PiperOrigin-RevId: 258353692
diff --git a/tools/cpp/cc_configure.bzl b/tools/cpp/cc_configure.bzl
index b57c860..36b3365 100644
--- a/tools/cpp/cc_configure.bzl
+++ b/tools/cpp/cc_configure.bzl
@@ -118,6 +118,22 @@
else:
configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools)
+MSVC_ENVVARS = [
+ "BAZEL_VC",
+ "BAZEL_VC_FULL_VERSION",
+ "BAZEL_VS",
+ "BAZEL_WINSDK_FULL_VERSION",
+ "VS90COMNTOOLS",
+ "VS100COMNTOOLS",
+ "VS110COMNTOOLS",
+ "VS120COMNTOOLS",
+ "VS140COMNTOOLS",
+ "VS150COMNTOOLS",
+ "VS160COMNTOOLS",
+ "TMP",
+ "TEMP",
+]
+
cc_autoconf = repository_rule(
environ = [
"ABI_LIBC_VERSION",
@@ -136,10 +152,6 @@
"BAZEL_USE_XCODE_TOOLCHAIN",
"BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN",
"BAZEL_USE_LLVM_NATIVE_COVERAGE",
- "BAZEL_VC",
- "BAZEL_VC_FULL_VERSION",
- "BAZEL_VS",
- "BAZEL_WINSDK_FULL_VERSION",
"BAZEL_LLVM",
"USE_CLANG_CL",
"CC",
@@ -149,16 +161,7 @@
"GCOV",
"HOMEBREW_RUBY_PATH",
"SYSTEMROOT",
- "VS90COMNTOOLS",
- "VS100COMNTOOLS",
- "VS110COMNTOOLS",
- "VS120COMNTOOLS",
- "VS140COMNTOOLS",
- "VS150COMNTOOLS",
- "VS160COMNTOOLS",
- "TMP",
- "TEMP",
- ],
+ ] + MSVC_ENVVARS,
implementation = cc_autoconf_impl,
)
