Don't set msys usr directory as cxx_builtin_include_directories for M…

…SVC toolchain Otherwise, if user's source code is under c:/tools/msys64/usr, include detection will all fail. RELNOTES: None PiperOrigin-RevId: 242097798
bazelbuild · Apr 5, 2019 · b137071 · b137071
1 parent 9d3dced
commit b137071
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tools/cpp/cc_toolchain_config.bzl.tpl b/tools/cpp/cc_toolchain_config.bzl.tpl
@@ -92,7 +92,7 @@ def _windows_msvc_impl(ctx):
     builtin_sysroot = None
 
     cxx_builtin_include_directories = [
-%{cxx_builtin_include_directories}
+%{msvc_cxx_builtin_include_directories}
     ]
 
     cpp_link_nodeps_dynamic_library_action = action_config(

diff --git a/tools/cpp/unix_cc_configure.bzl b/tools/cpp/unix_cc_configure.bzl
@@ -526,6 +526,7 @@ def configure_unix_toolchain(repository_ctx, cpu_value, overriden_tools):
             "%{msvc_ml_path}": "",
             "%{msvc_link_path}": "",
             "%{msvc_lib_path}": "",
+            "%{msvc_cxx_builtin_include_directories}": "",
             "%{msys_x64_mingw_cxx_content}": "",
             "%{msys_x64_mingw_link_content}": "",
             "%{dbg_mode_debug}": "",

diff --git a/tools/cpp/windows_cc_configure.bzl b/tools/cpp/windows_cc_configure.bzl
@@ -362,7 +362,7 @@ def configure_windows_toolchain(repository_ctx):
             )
 
     tool_paths_mingw, tool_bin_path_mingw, inc_dir_mingw, _ = _get_escaped_windows_msys_starlark_content(repository_ctx, use_mingw = True)
-    tool_paths, tool_bin_path, inc_dir, artifact_patterns = _get_escaped_windows_msys_starlark_content(repository_ctx)
+    tool_paths, tool_bin_path, inc_dir_msys, artifact_patterns = _get_escaped_windows_msys_starlark_content(repository_ctx)
     if not vc_path or missing_tools:
         repository_ctx.template(
             "cc_toolchain_config.bzl",
@@ -377,6 +377,7 @@ def configure_windows_toolchain(repository_ctx):
                 "%{msvc_ml_path}": "vc_installation_error.bat",
                 "%{msvc_link_path}": "vc_installation_error.bat",
                 "%{msvc_lib_path}": "vc_installation_error.bat",
+                "%{msvc_cxx_builtin_include_directories}": "",
                 "%{msys_x64_mingw_cxx_content}": get_starlark_list(["-std=gnu++0x"]),
                 "%{msys_x64_mingw_link_content}": get_starlark_list(["-lstdc++"]),
                 "%{dbg_mode_debug}": "/DEBUG",
@@ -388,7 +389,7 @@ def configure_windows_toolchain(repository_ctx):
                 "%{opt_link_content}": "",
                 "%{unfiltered_content}": "",
                 "%{dbg_compile_content}": "",
-                "%{cxx_builtin_include_directories}": inc_dir,
+                "%{cxx_builtin_include_directories}": inc_dir_msys,
                 "%{mingw_cxx_builtin_include_directories}": inc_dir_mingw,
                 "%{coverage_feature}": "",
                 "%{use_coverage_feature}": "",
@@ -477,7 +478,8 @@ def configure_windows_toolchain(repository_ctx):
             "%{opt_link_content}": "",
             "%{unfiltered_content}": "",
             "%{dbg_compile_content}": "",
-            "%{cxx_builtin_include_directories}": inc_dir + ",\n        ".join(escaped_cxx_include_directories),
+            "%{cxx_builtin_include_directories}": inc_dir_msys + ",\n        ".join(escaped_cxx_include_directories),
+            "%{msvc_cxx_builtin_include_directories}": "        " + ",\n        ".join(escaped_cxx_include_directories),
             "%{mingw_cxx_builtin_include_directories}": inc_dir_mingw + ",\n        ".join(escaped_cxx_include_directories),
             "%{coverage_feature}": "",
             "%{use_coverage_feature}": "",