diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-09 14:00:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 14:00:25 -0500 |
| commit | 1df907381de5483def338eff280697e0dafb2b75 (patch) | |
| tree | 411f3fe8945689486edb35084e71fccce1df3907 /googlemock/test | |
| parent | 258fd6e16820ea6c3d9a1ccd4c7d7ffc8ec38e40 (diff) | |
| parent | e194f52114a181cb3fb420d58d5ae2250207e828 (diff) | |
| download | googletest-1df907381de5483def338eff280697e0dafb2b75.tar.gz googletest-1df907381de5483def338eff280697e0dafb2b75.tar.bz2 googletest-1df907381de5483def338eff280697e0dafb2b75.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/BUILD.bazel | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/BUILD.bazel b/googlemock/test/BUILD.bazel index 9f1a64d8..4c2df9e2 100644 --- a/googlemock/test/BUILD.bazel +++ b/googlemock/test/BUILD.bazel @@ -45,7 +45,8 @@ cc_test( ], ), linkopts = select({ - "//:win": [], + "//:windows": [], + "//:windows_msvc": [], "//conditions:default": [ "-pthread", ], |