aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2015-06-26 14:31:50 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-06-26 15:31:02 +0000
commit38358932c016c0d999ff34276b2207802a888f8d (patch)
tree8551fd0f7d0fd642e26e26f673eddf96464a7aff
parentfd4615a5e09ea168b0e8a9400657e6f98f81c708 (diff)
Fix libunix dependency on OS X
Fixes #261. -- MOS_MIGRATED_REVID=96967085
-rw-r--r--src/BUILD5
-rw-r--r--src/main/java/com/google/devtools/build/workspace/BUILD4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/BUILD b/src/BUILD
index e5957de83d..9397380dd0 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -9,7 +9,10 @@ filegroup(
":darwin": ["//src/main/native:libunix.dylib"],
"//conditions:default": ["//src/main/native:libunix.so"],
}),
- visibility = ["//src/test/java:__pkg__"],
+ visibility = [
+ "//src/main/java/com/google/devtools/build/workspace:__pkg__",
+ "//src/test/java:__pkg__",
+ ],
)
genrule(
diff --git a/src/main/java/com/google/devtools/build/workspace/BUILD b/src/main/java/com/google/devtools/build/workspace/BUILD
index 919b4319f0..fc8e1617e0 100644
--- a/src/main/java/com/google/devtools/build/workspace/BUILD
+++ b/src/main/java/com/google/devtools/build/workspace/BUILD
@@ -4,6 +4,10 @@ java_binary(
"GenerateWorkspace.java",
"GenerateWorkspaceOptions.java",
],
+ data = [
+ "//src:libunix",
+ ],
+ jvm_flags = ["-Djava.library.path=$(GENDIR)/src/main/native"],
main_class = "com.google.devtools.build.workspace.GenerateWorkspace",
visibility = ["//visibility:public"],
deps = [