Merge pull request tensorflow#1252 from bogatyy/master

Fix Mac build: avoid duplicating TF symbols
rmunro · Mar 24, 2017 · b51cdf3 · b51cdf3
2 parents a522760 + ce9504a
commit b51cdf3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/syntaxnet/dragnn/components/stateless/stateless_component_test.cc b/syntaxnet/dragnn/components/stateless/stateless_component_test.cc
@@ -131,7 +131,7 @@ class StatelessComponentTest : public ::testing::Test {
 };
 
 TEST_F(StatelessComponentTest, ForwardsTransitionStates) {
-  const MockTransitionState mock_state_1, mock_state_2, mock_state_3;
+  MockTransitionState mock_state_1, mock_state_2, mock_state_3;
   const std::vector<std::vector<const TransitionState *>> parent_states = {
       {}, {&mock_state_1}, {&mock_state_2, &mock_state_3}};
 

diff --git a/syntaxnet/dragnn/components/syntaxnet/BUILD b/syntaxnet/dragnn/components/syntaxnet/BUILD
@@ -91,7 +91,6 @@ cc_test(
         "//dragnn/protos:spec_proto",
         "//syntaxnet:task_context",
         "//syntaxnet:test_main",
-        "@org_tensorflow//tensorflow/core:testlib",
     ],
 )
 
@@ -110,6 +109,5 @@ cc_test(
         "//syntaxnet:base",
         "//syntaxnet:sentence_proto",
         "//syntaxnet:test_main",
-        "@org_tensorflow//tensorflow/core:testlib",
     ],
 )
diff --git a/syntaxnet/dragnn/core/BUILD b/syntaxnet/dragnn/core/BUILD
@@ -246,7 +246,6 @@ cc_library(
         ":compute_session_op",
         ":resource_container",
         "//syntaxnet:base",
-        "@org_tensorflow//tensorflow/core:protos_all_cc",
         "@org_tensorflow//third_party/eigen3",
     ],
 )