Roll back the shared library, r96559. It broke two darwins and arm, mysteriously.

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 8cabd0b02cb00b37ecbe4da679387d6546e9c621..761cc812beed2d5d55311c959b178d3f0a46f782 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -613,12 +613,11 @@ endif
 ifneq ($(HOST_OS),Darwin)
 ifneq ($(DARWIN_MAJVERS),4)
 ifdef TOOLNAME
-  LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-  ifdef EXAMPLE_TOOL
-    LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
-  else
-    LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
-  endif
+ifdef EXAMPLE_TOOL
+  LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
+else
+  LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
+endif
 endif
 endif
 endif
@@ -953,21 +952,11 @@ $(LLVM_CONFIG):
 
 $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
 
-ifeq ($(ENABLE_SHARED), 1)
-LLVMLibsOptions += -lLLVM$(LLVMVersion)
-LLVMLibsPaths += $(LibDir)/libLLVM$(LLVMVersion)$(SHLIBEXT)
-else
-ifeq ($(EXAMPLE_TOOL), 1)
-LLVMLibsOptions += -lLLVM$(LLVMVersion)
-LLVMLibsPaths += $(LibDir)/libLLVM$(LLVMVersion)$(SHLIBEXT)
-else
 LLVMLibsOptions += $(shell $(LLVM_CONFIG) --libs     $(LINK_COMPONENTS))
 LLVMLibsPaths   += $(LLVM_CONFIG) \
                    $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS))
 endif
 endif
-endif
-endif
 
 ###############################################################################
 # Library Build Rules: Four ways to build a library
@@ -1173,13 +1162,11 @@ endif
 #   If neither BUILD_ARCHIVE or LOADABLE_MODULE are specified, default to
 #   building an archive.
 #---------------------------------------------------------
-ifndef NO_BUILD_ARCHIVE
 ifndef BUILD_ARCHIVE
 ifndef LOADABLE_MODULE
 BUILD_ARCHIVE = 1
 endif
 endif
-endif
 
 #---------------------------------------------------------
 # Archive Library Targets: