Merge pull request #189 from guoshimin/fixbazel

fix bazel build
google · May 23, 2016 · b0e145f · b0e145f
2 parents cf3307e + 83c7b4c
commit b0e145f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/core/BUILD b/core/BUILD
@@ -46,6 +46,7 @@ cc_library(
         ":lexer",
         "//stdlib:std",
     ],
+    includes = [".", "../include"],
 )
 
 cc_test(
@@ -80,7 +81,7 @@ cc_library(
         "//include:libjsonnet",
     ],
     linkopts = ["-lm"],
-    includes = ["."],
+    includes = [".", "../include"],
 )
 
 cc_library(
@@ -90,6 +91,7 @@ cc_library(
         ":jsonnet-common",
         "//include:libjsonnet",
     ],
+    includes = [".", "../include"],
 )
 
 cc_test(

diff --git a/cpp/testdata/BUILD b/cpp/testdata/BUILD
@@ -9,26 +9,26 @@ jsonnet_to_json_test(
     name = "example_test",
     src = "example.jsonnet",
     golden = "example_golden.json",
-    jsonnet = "//:jsonnet",
-    std = "//:std",
+    jsonnet = "//cmd:jsonnet",
+    std = "//stdlib",
 )
 
 jsonnet_to_json_test(
     name = "importing_test",
     src = "importing.jsonnet",
     golden = "importing_golden.json",
     imports = ["."],
-    jsonnet = "//:jsonnet",
-    std = "//:std",
+    jsonnet = "//cmd:jsonnet",
+    std = "//stdlib",
 )
 
 jsonnet_to_json_test(
     name = "invalid_test",
     src = "invalid.jsonnet",
     golden = "invalid.out",
     error = 1,
-    jsonnet = "//:jsonnet",
-    std = "//:std",
+    jsonnet = "//cmd:jsonnet",
+    std = "//stdlib",
 )
 
 filegroup(

diff --git a/stdlib/BUILD b/stdlib/BUILD
@@ -1,5 +1,10 @@
 package(default_visibility = ["//visibility:public"])
 
+filegroup(
+    name = "stdlib",
+    srcs = ["std.jsonnet"],
+)
+
 cc_library(
     name = "std",
     hdrs = ["std.jsonnet.h"],