diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-08 22:07:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 22:07:26 -0500 |
| commit | e194f52114a181cb3fb420d58d5ae2250207e828 (patch) | |
| tree | 5b06d821076e7013cb62593fb22270916292ba3a /BUILD.bazel | |
| parent | c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2 (diff) | |
| parent | cbd15d417e9a9b8dfbac4483d49b4e0c6664b940 (diff) | |
| download | googletest-e194f52114a181cb3fb420d58d5ae2250207e828.tar.gz googletest-e194f52114a181cb3fb420d58d5ae2250207e828.tar.bz2 googletest-e194f52114a181cb3fb420d58d5ae2250207e828.zip | |
Merge pull request #1388 from rongjiecomputer/bazel
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
Diffstat (limited to 'BUILD.bazel')
| -rw-r--r-- | BUILD.bazel | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 922ce04e..7d2e9d2b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -37,7 +37,12 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) config_setting( - name = "win", + name = "windows", + values = { "cpu": "x64_windows" }, +) + +config_setting( + name = "windows_msvc", values = {"cpu": "x64_windows_msvc"}, ) @@ -65,7 +70,8 @@ cc_library( ]), copts = select( { - ":win": [], + ":windows": [], + ":windows_msvc": [], "//conditions:default": ["-pthread"], }, ), @@ -76,7 +82,8 @@ cc_library( "googletest/include", ], linkopts = select({ - ":win": [], + ":windows": [], + ":windows_msvc": [], "//conditions:default": [ "-pthread", ], |