[llvm-branch-commits] [llvm-branch] r155574 - in /llvm/branches/release_31: ./ tools/llvm-shlib/Makefile

[Bill Wendling]

Author: void
Date: Wed Apr 25 13:27:12 2012
New Revision: 155574

URL: http://llvm.org/viewvc/llvm-project?rev=155574&view=rev
Log:
Merging r155536:
------------------------------------------------------------------------
r155536 | lattner | 2012-04-24 23:37:20 -0700 (Tue, 24 Apr 2012) | 3 lines

openbsd doesn't support soname, patch by Brad Smith!


------------------------------------------------------------------------

Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/tools/llvm-shlib/Makefile

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 13:27:12 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230,155284-155288,155307,155342,155466
+/llvm/trunk:155230,155284-155288,155307,155342,155466,155536

Modified: llvm/branches/release_31/tools/llvm-shlib/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/tools/llvm-shlib/Makefile?rev=155574&r1=155573&r2=155574&view=diff
==============================================================================
--- llvm/branches/release_31/tools/llvm-shlib/Makefile (original)
+++ llvm/branches/release_31/tools/llvm-shlib/Makefile Wed Apr 25 13:27:12 2012
@@ -67,6 +67,9 @@
     # Include everything from the .a's into the shared library.
     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
                        -Wl,--no-whole-archive
+endif
+
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
     # Add soname to the library.
     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
 endif