diff options
| author |  Yun Peng <pcloudy@google.com> | 2017-06-28 12:27:00 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-06-28 15:27:13 +0200 |
| commit | 86a9a5038b81623e08e5f5513b015f065ce400ea (patch) | |
| tree | a7f044a32c832f172ed5a64b8c8228d4c24a332a | |
| parent | 6e940e573d20a3220ac433901c5650ee74226a17 (diff) | |
Make Bazel build with wrapper-free CROSSTOOL on Windows
Change-Id: I0824332896b776e8296608a6b831abba33697845
PiperOrigin-RevId: 160390320
| -rw-r--r-- | src/main/cpp/BUILD | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD index ed8ea20085..a3abaf482e 100644 --- a/src/main/cpp/BUILD +++ b/src/main/cpp/BUILD @@ -5,10 +5,10 @@ package( ) WIN_LINK_OPTS = [ - "-Wl,advapi32.lib", # GetUserNameW - "-Wl,ole32.lib", # CoTaskMemFree - "-Wl,shell32.lib", # SHGetKnownFolderPath - "-Wl,ws2_32.lib", # grpc + "-DEFAULTLIB:advapi32.lib", # GetUserNameW + "-DEFAULTLIB:ole32.lib", # CoTaskMemFree + "-DEFAULTLIB:shell32.lib", # SHGetKnownFolderPath + "-DEFAULTLIB:ws2_32.lib", # grpc ] cc_library( @@ -89,9 +89,11 @@ cc_binary( "workspace_layout.cc", "workspace_layout.h", ], - copts = [ - "-Wno-sign-compare", - ], + copts = select({ + "//src:windows": ["/wd4018"], + "//src:windows_msvc": ["/wd4018"], + "//conditions:default": ["-Wno-sign-compare"], + }), linkopts = select({ "//src:darwin": [ ], |