From 91ef17196bf0db0cb8b5b536a5bf139a27ae06a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 2 Jun 2022 05:47:51 +0300 Subject: [PATCH] windows: add dynamic_library_linkopts The patchset was created before 921fda92603cd59c876792fc99b912c04779a800, which added an option to zig_cc_toolchain_config, causing a "soft merge conflict" after merging. --- toolchain/private/defs.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/toolchain/private/defs.bzl b/toolchain/private/defs.bzl index 81bc648..1aba438 100644 --- a/toolchain/private/defs.bzl +++ b/toolchain/private/defs.bzl @@ -80,6 +80,7 @@ def _target_windows(gocpu, zigcpu): "libc/include/any-windows-any", ], linkopts = [], + dynamic_library_linkopts = [], copts = [], bazel_target_cpu = "x64_windows", constraint_values = [