diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 6d07b7e2af..44b69ca9c3 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -89,6 +89,7 @@ coverage_validation_post_shell_commands: &coverage_validation_post_shell_command ; exit 1 \ ; } split_coverage_postprocessing_shell_commands: &split_coverage_postprocessing_shell_commands + - echo "9.0.0rc3" > .bazelversion - echo "coverage --experimental_fetch_all_coverage_outputs" >> user.bazelrc - echo "coverage --experimental_split_coverage_postprocessing" >> user.bazelrc - echo "build --//rust/settings:experimental_use_coverage_metadata_files" >> user.bazelrc diff --git a/examples/cross_compile_nix/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl b/examples/cross_compile_nix/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl index 586cac7807..6b729c8bba 100644 --- a/examples/cross_compile_nix/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl +++ b/examples/cross_compile_nix/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl @@ -6,6 +6,7 @@ load( "feature", ) load("@rules_cc//cc/common:cc_common.bzl", "cc_common") +load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo") load("//bazel/toolchain_rules/cc_tools:clang.bzl", clang_compile_action_configs = "compile_action_configs") load("//bazel/toolchain_rules/cc_tools:ld.lld.bzl", ld_lld_link_action_configs = "link_action_configs") load("//bazel/toolchain_rules/cc_tools:ld64.lld.bzl", ld64_lld_link_action_configs = "link_action_configs") diff --git a/extensions/bindgen/test/bindgen_test.bzl b/extensions/bindgen/test/bindgen_test.bzl index bdcbfa1035..8af3b7b5ef 100644 --- a/extensions/bindgen/test/bindgen_test.bzl +++ b/extensions/bindgen/test/bindgen_test.bzl @@ -5,6 +5,7 @@ load("@rules_cc//cc:action_names.bzl", "ALL_CPP_COMPILE_ACTION_NAMES") load("@rules_cc//cc:cc_toolchain_config_lib.bzl", "feature", "flag_group", "flag_set") load("@rules_cc//cc:defs.bzl", "cc_library", "cc_toolchain") load("@rules_cc//cc/common:cc_common.bzl", "cc_common") +load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo") load("@rules_rust//rust:defs.bzl", "rust_binary") load("@rules_rust_bindgen//:defs.bzl", "rust_bindgen_library") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl index a28ad50b78..af627fe508 100644 --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl @@ -2361,19 +2361,19 @@ def _get_make_link_flag_funcs(target_os, target_abi, use_direct_link_driver): - callable: The function for producing link args. - callable: The function for formatting link library names. """ + + get_lib_name = get_lib_name_default + if target_os == "windows": - make_link_flags_windows_msvc = _make_link_flags_windows_msvc_direct if use_direct_link_driver else _make_link_flags_windows_msvc_indirect - make_link_flags_windows_gnu = _make_link_flags_windows_gnu_direct if use_direct_link_driver else _make_link_flags_windows_gnu_indirect - make_link_flags = make_link_flags_windows_msvc if target_abi == "msvc" else make_link_flags_windows_gnu - get_lib_name = get_lib_name_for_windows + if target_abi == "msvc": + make_link_flags = _make_link_flags_windows_msvc_direct if use_direct_link_driver else _make_link_flags_windows_msvc_indirect + get_lib_name = get_lib_name_for_windows + else: + make_link_flags = _make_link_flags_windows_gnu_direct if use_direct_link_driver else _make_link_flags_windows_gnu_indirect elif target_os.startswith(("mac", "darwin", "ios")): - make_link_flags_darwin = _make_link_flags_darwin_direct if use_direct_link_driver else _make_link_flags_darwin_indirect - make_link_flags = make_link_flags_darwin - get_lib_name = get_lib_name_default + make_link_flags = _make_link_flags_darwin_direct if use_direct_link_driver else _make_link_flags_darwin_indirect else: - make_link_flags_default = _make_link_flags_default_direct if use_direct_link_driver else _make_link_flags_default_indirect - make_link_flags = make_link_flags_default - get_lib_name = get_lib_name_default + make_link_flags = _make_link_flags_default_direct if use_direct_link_driver else _make_link_flags_default_indirect return (make_link_flags, get_lib_name) diff --git a/test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl b/test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl index 512cc2d545..d32eb7f4cc 100644 --- a/test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl +++ b/test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl @@ -12,6 +12,7 @@ load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES", "ACTION_NAME_GROUPS") load("@rules_cc//cc:cc_toolchain_config_lib.bzl", "action_config", "feature", "flag_group", "flag_set", "tool", "tool_path") load("@rules_cc//cc:defs.bzl", "cc_toolchain") load("@rules_cc//cc/common:cc_common.bzl", "cc_common") +load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo") load("//cargo:defs.bzl", "cargo_build_script") _EXPECTED_CC_TOOLCHAIN_TOOLS = { diff --git a/test/unit/cc_toolchain_runtime_lib/cc_toolchain_runtime_lib_test.bzl b/test/unit/cc_toolchain_runtime_lib/cc_toolchain_runtime_lib_test.bzl index ff804cb03e..b097e1faf0 100644 --- a/test/unit/cc_toolchain_runtime_lib/cc_toolchain_runtime_lib_test.bzl +++ b/test/unit/cc_toolchain_runtime_lib/cc_toolchain_runtime_lib_test.bzl @@ -6,6 +6,7 @@ load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load("@rules_cc//cc:cc_toolchain_config_lib.bzl", "feature") load("@rules_cc//cc:defs.bzl", "cc_toolchain") load("@rules_cc//cc/common:cc_common.bzl", "cc_common") +load("@rules_cc//cc/toolchains:cc_toolchain_config_info.bzl", "CcToolchainConfigInfo") load("//rust:defs.bzl", "rust_shared_library", "rust_static_library") def _test_cc_config_impl(ctx):