-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DO NOT MERGE] Attempt and info for merging master into macOS build #39
base: master
Are you sure you want to change the base?
Changes from 1 commit
5786912
b6063a3
32c3441
aed9c51
c52865e
f4e76ca
f4f9308
8fbb22d
eef29e5
7f02b78
7f73e78
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -107,20 +107,20 @@ def reverb_cc_proto_library(name, srcs = [], deps = [], **kwargs): | |
name = "{}_static".format(name), | ||
srcs = gen_srcs, | ||
hdrs = gen_hdrs, | ||
deps = depset([dep.replace(":", ":lib") + ".so" for dep in deps] + reverb_tf_deps()), | ||
deps = depset([dep.replace(":", ":libxxx") + ".so" for dep in deps] + reverb_tf_deps()), | ||
alwayslink = 1, | ||
**kwargs | ||
) | ||
native.cc_binary( | ||
name = "lib{}.so".format(name), | ||
name = "libxxx{}.so".format(name), | ||
deps = ["{}_static".format(name)], | ||
linkshared = 1, | ||
**kwargs | ||
) | ||
native.cc_library( | ||
name = name, | ||
hdrs = gen_hdrs, | ||
srcs = ["lib{}.so".format(name)], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These |
||
srcs = ["libxxx{}.so".format(name)], | ||
deps = depset(deps + reverb_tf_deps()), | ||
alwayslink = 1, | ||
**kwargs | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -103,7 +103,7 @@ def _find_python_solib_path(repo_ctx): | |
.format(exec_result.stderr)) | ||
|
||
if is_darwin(repo_ctx): | ||
basename = "lib{}m.dylib".format(version) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See #24 (comment) |
||
basename = "lib{}.dylib".format(version) | ||
solib_dir = "/".join(exec_result.stdout.splitlines()[-1].split("/")[:-2]) | ||
else: | ||
basename = "lib{}.so".format(version) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was necessary due to bazelbuild/bazel#4341.
I also had to use
bazel==4.1.0rc04
-- I tried 4.0.0 (the latest homebrew version) and that didn't work for me for some reason.