Skip to content

Commit 85221b1

Browse files
meteorcloudycopybara-github
authored andcommitted
Support shorten_virtual_includes
Copybara Import from #438 BEGIN_PUBLIC Support shorten_virtual_includes (#438) Context: bazelbuild/bazel#26528, protocolbuffers/protobuf#20085 Enable `shorten_virtual_includes` for MSVC toolchains to shorten virtual include paths to mitigate long path issue on windows. Closes #438 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=#438 from meteorcloudy:shorten_virtual_includes 5ab4b94 PiperOrigin-RevId: 781977791 Change-Id: Ia683103cb9da2eed8cca165ccf1243f3ee1357da
1 parent 0692005 commit 85221b1

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

cc/private/toolchain/BUILD.windows.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ cc_toolchain_config(
330330
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_x64}",
331331
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_x64}",
332332
supports_parse_showincludes = %{msvc_parse_showincludes_x64},
333+
shorten_virtual_includes = True,
333334
)
334335

335336
toolchain(
@@ -399,6 +400,7 @@ cc_toolchain_config(
399400
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_x86}",
400401
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_x86}",
401402
supports_parse_showincludes = %{msvc_parse_showincludes_x86},
403+
shorten_virtual_includes = True,
402404
)
403405

404406
toolchain(
@@ -468,6 +470,7 @@ cc_toolchain_config(
468470
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_arm}",
469471
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_arm}",
470472
supports_parse_showincludes = %{msvc_parse_showincludes_arm},
473+
shorten_virtual_includes = True,
471474
)
472475

473476
toolchain(
@@ -537,6 +540,7 @@ cc_toolchain_config(
537540
dbg_mode_debug_flag = "%{dbg_mode_debug_flag_arm64}",
538541
fastbuild_mode_debug_flag = "%{fastbuild_mode_debug_flag_arm64}",
539542
supports_parse_showincludes = %{msvc_parse_showincludes_arm64},
543+
shorten_virtual_includes = True,
540544
)
541545

542546
toolchain(

cc/private/toolchain/windows_cc_toolchain_config.bzl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,11 @@ def _impl(ctx):
943943
enabled = True,
944944
)
945945

946+
shorten_virtual_includes_feature = feature(
947+
name = "shorten_virtual_includes",
948+
enabled = ctx.attr.shorten_virtual_includes,
949+
)
950+
946951
treat_warnings_as_errors_feature = feature(
947952
name = "treat_warnings_as_errors",
948953
flag_sets = [
@@ -1277,6 +1282,7 @@ def _impl(ctx):
12771282
preprocessor_defines_feature,
12781283
parse_showincludes_feature,
12791284
no_dotd_file_feature,
1285+
shorten_virtual_includes_feature,
12801286
generate_pdb_file_feature,
12811287
generate_linkmap_feature,
12821288
shared_flag_feature,
@@ -1657,6 +1663,7 @@ cc_toolchain_config = rule(
16571663
"msvc_lib_path": attr.string(default = "vc_installation_error.bat"),
16581664
"msvc_link_path": attr.string(default = "vc_installation_error.bat"),
16591665
"msvc_ml_path": attr.string(default = "vc_installation_error.bat"),
1666+
"shorten_virtual_includes": attr.bool(default = False),
16601667
"supports_parse_showincludes": attr.bool(),
16611668
"target_libc": attr.string(),
16621669
"target_system_name": attr.string(),

0 commit comments

Comments
 (0)