diff options
| author |  Topher <topher.the.geek@gmail.com> | 2015-08-19 09:23:46 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-08-20 14:47:39 +0000 |
| commit | 50adddf01b8d7f46fba6bee12ebbb41c31c87165 (patch) | |
| tree | 177878ecd90ec44d82e2a988a7494f93a84d1f8d /src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java | |
| parent | a3a33d75393df267303a517ac72b87d4f11cad31 (diff) | |
Fixes to use dylib on MacOS X.
The change in LinkCommandLine.java fixes the error "ld: library not found for -ltbb.dylib". The change in osx_gcc_wrapper.sh fixes the error "dyld: Library not loaded: @rpath/libtbb.dylib".
See https://groups.google.com/forum/#!topic/bazel-discuss/bs8BnXYRjzY
--
Change-Id: I7feb02eee7d059d86a6d29af391dc2fc71e1d0cc
Reviewed-on: https://bazel-review.googlesource.com/#/c/1831/
MOS_MIGRATED_REVID=101007071
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java index b9a4fb90ee..27cc2563e7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java @@ -911,7 +911,7 @@ public final class LinkCommandLine extends CommandLine { String name = inputArtifact.getFilename(); if (CppFileTypes.SHARED_LIBRARY.matches(name)) { - String libName = name.replaceAll("(^lib|\\.so$)", ""); + String libName = name.replaceAll("(^lib|\\.(dylib|so)$)", ""); options.add("-l" + libName); } else { // Interface shared objects have a non-standard extension |