diff options
| author |  Loo Rong Jie <loorongjie@gmail.com> | 2017-12-27 03:24:16 +0800 |
|---|---|---|
| committer |  drpngx <drpngx@users.noreply.github.com> | 2017-12-26 11:24:16 -0800 |
| commit | 09f2aba3bdda18956237661655fc45ae36854c52 (patch) | |
| tree | 1fab494b40ce265eb9396dda9f26a3309cd86232 | |
| parent | 6a46bdca93f9ae5f3e2419e1c7c856f04622daa9 (diff) | |
[Bazel/MSVC] Fix build error since aae439c (#15579)
* [Bazel/MSVC] Fix build error since aae439c
* Revert "[Bazel/MSVC] Fix build error since aae439c"
This reverts commit 635f6202f312165b5e29c2ef9cf70f1614b4043e.
* [Bazel/MSVC] Fix build error since aae439c
| -rw-r--r-- | tensorflow/core/BUILD | 2 | ||||
| -rw-r--r-- | tensorflow/core/platform/default/build_config.bzl | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index ae38025942..b8ff44bc4b 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -274,7 +274,7 @@ cc_library( "platform/platform.h", "platform/protobuf.h", "platform/types.h", - ] + glob(tf_additional_proto_hdrs()) + glob(tf_env_time_hdrs()), + ] + tf_additional_proto_hdrs() + glob(tf_env_time_hdrs()), copts = tf_copts(), deps = tf_lib_proto_parsing_deps(), ) diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl index 948334d27b..b357be8e63 100644 --- a/tensorflow/core/platform/default/build_config.bzl +++ b/tensorflow/core/platform/default/build_config.bzl @@ -3,6 +3,7 @@ load("@protobuf_archive//:protobuf.bzl", "proto_gen") load("@protobuf_archive//:protobuf.bzl", "py_proto_library") load("//tensorflow:tensorflow.bzl", "if_not_mobile") +load("//tensorflow:tensorflow.bzl", "if_windows") load("//tensorflow:tensorflow.bzl", "if_not_windows") load("//tensorflow/core:platform/default/build_config_root.bzl", "if_static") load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda") @@ -358,7 +359,9 @@ def tf_additional_proto_hdrs(): "platform/default/integral_types.h", "platform/default/logging.h", "platform/default/protobuf.h" - ] + ] + if_windows([ + "platform/windows/integral_types.h", + ]) def tf_additional_proto_srcs(): return [ |