Commit cd43bea7 by Abseil Team Committed by Copybara-Service

Fix //absl/{base,debugging:symbolize} build with Mingw

PiperOrigin-RevId: 512974770
Change-Id: If7a8128996d2a73ac566faaa676ddd3858d51af6
parent 0c1114c4
...@@ -36,7 +36,7 @@ config_setting( ...@@ -36,7 +36,7 @@ config_setting(
) )
config_setting( config_setting(
name = "mingw_compiler", name = "mingw_unspecified_compiler",
flag_values = { flag_values = {
"@bazel_tools//tools/cpp:compiler": "mingw", "@bazel_tools//tools/cpp:compiler": "mingw",
}, },
...@@ -44,6 +44,14 @@ config_setting( ...@@ -44,6 +44,14 @@ config_setting(
) )
config_setting( config_setting(
name = "mingw-gcc_compiler",
flag_values = {
"@bazel_tools//tools/cpp:compiler": "mingw-gcc",
},
visibility = [":__subpackages__"],
)
config_setting(
name = "msvc_compiler", name = "msvc_compiler",
flag_values = { flag_values = {
"@bazel_tools//tools/cpp:compiler": "msvc-cl", "@bazel_tools//tools/cpp:compiler": "msvc-cl",
...@@ -131,3 +139,12 @@ config_setting( ...@@ -131,3 +139,12 @@ config_setting(
}, },
visibility = [":__subpackages__"], visibility = [":__subpackages__"],
) )
selects.config_setting_group(
name = "mingw_compiler",
match_any = [
":mingw_unspecified_compiler",
":mingw-gcc_compiler",
],
visibility = [":__subpackages__"],
)
...@@ -246,6 +246,10 @@ cc_library( ...@@ -246,6 +246,10 @@ cc_library(
"//absl:clang-cl_compiler": [ "//absl:clang-cl_compiler": [
"-DEFAULTLIB:advapi32.lib", "-DEFAULTLIB:advapi32.lib",
], ],
"//absl:mingw_compiler": [
"-DEFAULTLIB:advapi32.lib",
"-ladvapi32",
],
"//absl:wasm": [], "//absl:wasm": [],
"//conditions:default": ["-pthread"], "//conditions:default": ["-pthread"],
}) + ABSL_DEFAULT_LINKOPTS, }) + ABSL_DEFAULT_LINKOPTS,
......
...@@ -83,6 +83,10 @@ cc_library( ...@@ -83,6 +83,10 @@ cc_library(
linkopts = ABSL_DEFAULT_LINKOPTS + select({ linkopts = ABSL_DEFAULT_LINKOPTS + select({
"//absl:msvc_compiler": ["-DEFAULTLIB:dbghelp.lib"], "//absl:msvc_compiler": ["-DEFAULTLIB:dbghelp.lib"],
"//absl:clang-cl_compiler": ["-DEFAULTLIB:dbghelp.lib"], "//absl:clang-cl_compiler": ["-DEFAULTLIB:dbghelp.lib"],
"//absl:mingw_compiler": [
"-DEFAULTLIB:dbghelp.lib",
"-ldbghelp",
],
"//conditions:default": [], "//conditions:default": [],
}), }),
deps = [ deps = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment