Skip to content

Commit

Permalink
Merge pull request RobotLocomotion#8702 from jamiesnape/mosek-mac
Browse files Browse the repository at this point in the history
Fix MOSEK builds on macOS
  • Loading branch information
jamiesnape authored Apr 27, 2018
2 parents 4f83f7c + f584f3e commit 14596fb
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions tools/workspace/mosek/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,15 @@ def _impl(repository_ctx):
if repository_ctx.os.name == "mac os x":
install_name_tool = which(repository_ctx, "install_name_tool")

# Note that in the 8.1.0.51 packages, libmosek64.dylib is a copy of
# libmosek64.8.1.dylib instead of a symlink. Otherwise, the list of
# files should include the following in place of bin/libmosek64.dylib:
#
# "bin/libmosek64.{}.{}.dylib".format(mosek_major_version,
# mosek_minor_version)
files = [
# N.B. We are using and installing MOSEK's copy of libcilkrts.so.5,
# even though Ubuntu installs the same shared library by default on
# all systems already. For some reason, Mosek fails when used with
# Ubuntu's shared library. If Drake users have other third-party
# code that assumes use of Ubunut's libcilkrts, there could be
# runtime conflicts; however, this risk seems low.
"bin/libcilkrts.5.dylib",
"bin/libmosek64.{}.{}.dylib".format(mosek_major_version,
mosek_minor_version),
"bin/libmosek64.dylib",
]

for file in files:
Expand Down

0 comments on commit 14596fb

Please sign in to comment.