diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2010-02-18 04:43:02 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2010-02-18 04:43:02 +0000 |
| commit | 2155d459a7de626bb77849e5956ef2363d7d4a87 (patch) | |
| tree | b0659bdb76efe558b1dbdceaff2d5f3eda2f2ee5 /Makefile.rules | |
| parent | adb561d4e0a37c21159405dde90d2ef2d1a5eef9 (diff) | |
| download | external_llvm-2155d459a7de626bb77849e5956ef2363d7d4a87.zip external_llvm-2155d459a7de626bb77849e5956ef2363d7d4a87.tar.gz external_llvm-2155d459a7de626bb77849e5956ef2363d7d4a87.tar.bz2 | |
Roll back the shared library, r96559. It broke two darwins and arm, mysteriously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96569 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/Makefile.rules b/Makefile.rules index 8cabd0b..761cc81 100644 --- 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: |