diff options
| author |  Yun Peng <pcloudy@google.com> | 2017-06-08 08:43:21 +0200 |
|---|---|---|
| committer |  gunan <gunan@google.com> | 2017-06-07 23:43:21 -0700 |
| commit | 08ed32dbb9e8f67eec9efce3807b5bdb3933eb2f (patch) | |
| tree | 05546977d3132976761935abe3e435d5ed3f88a0 /third_party/farmhash.BUILD | |
| parent | 02dbe153afe2c7f418fcf9044e2e3a8795a21d3a (diff) | |
Windows: Make TensorFlow build without --cpu=x64_windows_msvc (#10466)
* Windows: Make TensorFlow build without --cpu=x64_windows_msvc
Since from Bazel 0.5.0, MSVC toolchain became the default toolchain on
Windows. So --cpu=x64_windows_msvc is not required as long as we adjust
the BUILD files in TensorFlow.
--cpu=x64_windows_msvc is also supported for now, but is depracated.
The configuration for cpu value x64_windows_msvc is a duplicate of
x64_windows, which should be removed in the future.
* Fix breakage on macOS
Diffstat (limited to 'third_party/farmhash.BUILD')
| -rw-r--r-- | third_party/farmhash.BUILD | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/third_party/farmhash.BUILD b/third_party/farmhash.BUILD index 6a1d4da6e5..a51e1511c1 100644 --- a/third_party/farmhash.BUILD +++ b/third_party/farmhash.BUILD @@ -3,12 +3,19 @@ licenses(["notice"]) # MIT exports_files(["COPYING"]) config_setting( - name = "windows", + name = "windows_msvc", values = { "cpu": "x64_windows_msvc", }, ) +config_setting( + name = "windows", + values = { + "cpu": "x64_windows", + }, +) + cc_library( name = "farmhash", srcs = ["src/farmhash.cc"], @@ -16,6 +23,7 @@ cc_library( # Disable __builtin_expect support on Windows copts = select({ ":windows": ["/DFARMHASH_OPTIONAL_BUILTIN_EXPECT"], + ":windows_msvc": ["/DFARMHASH_OPTIONAL_BUILTIN_EXPECT"], "//conditions:default": [], }), includes = ["src/."], |