[llvm-branch-commits] [cfe-branch] r155572 - in /cfe/branches/release_31: ./ test/SemaCXX/warn-unreachable.cpp tools/libclang/Makefile

[Bill Wendling]

Author: void
Date: Wed Apr 25 13:26:01 2012
New Revision: 155572

URL: http://llvm.org/viewvc/llvm-project?rev=155572&view=rev
Log:
Merging r155534:
------------------------------------------------------------------------
r155534 | lattner | 2012-04-24 23:09:30 -0700 (Tue, 24 Apr 2012) | 3 lines

don't use soname on OpenBSD, it doesn't support it.  Patch by
Brad Smith!

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

Modified:
    cfe/branches/release_31/   (props changed)
    cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp   (props changed)
    cfe/branches/release_31/tools/libclang/Makefile

Propchange: cfe/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 13:26:01 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:155076,155279,155342
+/cfe/trunk:155076,155279,155342,155534
 /cfe/trunk/test/SemaTemplate:126920

Propchange: cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 25 13:26:01 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279,155342
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279,155342,155534

Modified: cfe/branches/release_31/tools/libclang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/tools/libclang/Makefile?rev=155572&r1=155571&r2=155572&view=diff
==============================================================================
--- cfe/branches/release_31/tools/libclang/Makefile (original)
+++ cfe/branches/release_31/tools/libclang/Makefile Wed Apr 25 13:26:01 2012
@@ -24,7 +24,7 @@
 include $(CLANG_LEVEL)/Makefile
 
 # Add soname to the library.
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD OpenBSD GNU))
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU))
         LDFLAGS += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT)
 endif