diff options
| author |  Ulf Adams <ulfjack@google.com> | 2015-08-19 11:27:02 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-08-20 14:47:42 +0000 |
| commit | 8284bd7e15a160ff353b3dcece389d3df45c783b (patch) | |
| tree | e10749c9db4bd61dd168c961a7788a27bccbb193 /src/main/java/com/google/devtools/build/lib/rules/cpp | |
| parent | 50adddf01b8d7f46fba6bee12ebbb41c31c87165 (diff) | |
Rollback of commit 50adddf01b8d7f46fba6bee12ebbb41c31c87165.
*** Reason for rollback ***
Makes some tests fail, oddly enough.
*** Original change description ***
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
--
MOS_MIGRATED_REVID=101012689
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
| -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 27cc2563e7..b9a4fb90ee 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|\\.(dylib|so)$)", ""); + String libName = name.replaceAll("(^lib|\\.so$)", ""); options.add("-l" + libName); } else { // Interface shared objects have a non-standard extension |