+1
-49
lines changedFilter options
+1
-49
lines changed Original file line number Diff line number Diff line change
@@ -427,7 +427,7 @@ jobs:
427 427
- name: Windows Bazel
428 428
os: windows-2022
429 429
cache_key: windows-2022-msvc-cl
430 -
bazel: test //src/... --config=msvc-cl --test_tag_filters=-conformance --build_tag_filters=-conformance --define=protobuf_allow_msvc=true
430 +
bazel: test //src/... --config=msvc-cl --test_tag_filters=-conformance --build_tag_filters=-conformance
431 431
- name: Windows Bazel clang-cl
432 432
os: windows-2022
433 433
cache_key: windows-2022-clang-cl
@@ -3,7 +3,6 @@ common --enable_platform_specific_config
3 3
build:linux --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
4 4
build:macos --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
5 5 6 -
build:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl --extra_execution_platforms=//:x64_windows-clang-cl
7 6
common:windows --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 --enable_runfiles
8 7 9 8
build --experimental_remote_cache_eviction_retries=5
@@ -193,16 +193,3 @@ pkg_files(
193 193
strip_prefix = strip_prefix.from_root(""),
194 194
visibility = ["//visibility:public"],
195 195
)
196 - 197 -
platform(
198 -
name = "x64_windows-clang-cl",
199 -
constraint_values = [
200 -
"@platforms//cpu:x86_64",
201 -
"@platforms//os:windows",
202 -
# This is necessary for Bazel 7 compatibility with a MODULE.bazel file that still works in
203 -
# Bazel 8. Using cc_configure_extension from rules_cc produces a @local_config_cc
204 -
# repository that's not compatible with @bazel_tools//tools/cpp:clang-cl from before
205 -
# Bazel 8. See https://github.com/bazelbuild/rules_cc/issues/330.
206 -
"@rules_cc//cc/private/toolchain:clang-cl",
207 -
],
208 -
)
Original file line number Diff line number Diff line change
@@ -19,12 +19,7 @@ local_path_override(
19 19
)
20 20 21 21
bazel_dep(name = "bazel_skylib", version = "1.7.1")
22 -
bazel_dep(name = "platforms", version = "0.0.10")
23 22
bazel_dep(name = "rules_cc", version = "0.0.17")
24 23
bazel_dep(name = "rules_java", version = "8.6.1")
25 24
bazel_dep(name = "rules_pkg", version = "1.0.1")
26 25
bazel_dep(name = "rules_python", version = "1.4.1")
27 - 28 -
# For clang-cl configuration
29 -
cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_extension")
30 -
use_repo(cc_configure, "local_config_cc")
Original file line number Diff line number Diff line change
@@ -33,16 +33,6 @@ local_repository(
33 33
path = "..",
34 34
)
35 35 36 -
# Bazel platform rules, for clang-cl.
37 -
http_archive(
38 -
name = "platforms",
39 -
sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
40 -
urls = [
41 -
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
42 -
"https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
43 -
],
44 -
)
45 - 46 36
load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
47 37 48 38
protobuf_deps()
@@ -59,12 +49,6 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
59 49 60 50
py_repositories()
61 51 62 -
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
63 - 64 -
rules_cc_dependencies()
65 - 66 -
rules_cc_toolchains()
67 - 68 52
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
69 53 70 54
rules_jvm_external_deps()
@@ -22,12 +22,6 @@ cc_library(
22 22
"status_macros.h",
23 23
],
24 24
copts = COPTS,
25 -
defines = ["GOOGLE_PROTOBUF_USING_BAZEL=1"] + select({
26 -
"//build_defs:protobuf_allow_msvc": [
27 -
"GOOGLE_PROTOBUF_MSVC_BAZEL_OVERRIDE=1",
28 -
],
29 -
"//conditions:default": [],
30 -
}),
31 25
linkopts = LINK_OPTS,
32 26
strip_include_prefix = "/src",
33 27
deps = [
@@ -31,13 +31,6 @@
31 31
#include <byteswap.h> // IWYU pragma: export
32 32
#endif
33 33 34 -
#if defined(_MSC_VER) && !defined(__clang__) && \
35 -
defined(GOOGLE_PROTOBUF_USING_BAZEL) && \
36 -
!defined(GOOGLE_PROTOBUF_MSVC_BAZEL_OVERRIDE)
37 -
#error \
38 -
"Protobuf will be dropping support for MSVC + Bazel in 34.0. To continue using it until then, use the flag --define=protobuf_allow_msvc=true. For feedback or discussion, see github.com/protocolbuffers/protobuf/issues/20085."
39 -
#endif
40 - 41 34
// Legacy: some users reference these (internal-only) macros even though we
42 35
// don't need them any more.
43 36
#if defined(_MSC_VER) && defined(PROTOBUF_USE_DLLS)
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4