[llvm-branch-commits] [llvm-branch] r121529 - /llvm/branches/Apple/whitney/Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:31:50 2010
New Revision: 121529

URL: http://llvm.org/viewvc/llvm-project?rev=121529&view=rev
Log:
Merge r121223:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Wed Dec 8 01:48:05 2010 +0000

    build: Don't force -flat_namespace or '-undefined suppress' on unsuspecting users of LLVM makefiles, these options really shouldn't be used on Darwin.

Modified:
    llvm/branches/Apple/whitney/Makefile.rules

Modified: llvm/branches/Apple/whitney/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/Makefile.rules?rev=121529&r1=121528&r2=121529&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/Makefile.rules (original)
+++ llvm/branches/Apple/whitney/Makefile.rules Fri Dec 10 15:31:50 2010
@@ -498,8 +498,8 @@
   # Get "4" out of 10.4 for later pieces in the makefile.
   DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
 
-  SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined,suppress \
-                    -dynamiclib
+  LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress
+  SharedLinkOptions := -dynamiclib
   ifneq ($(ARCH),ARM)
     SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION)
   endif
@@ -1109,6 +1109,7 @@
 ifdef LINK_LIBS_IN_SHARED
 ifdef LOADABLE_MODULE
 SharedLibKindMessage := "Loadable Module"
+SharedLinkOptions := $(LoadableModuleOptions) $(SharedLinkOptions)
 else
 SharedLibKindMessage := "Shared Library"
 endif