diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2010-02-23 20:53:37 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2010-02-23 20:53:37 +0000 |
| commit | 407fbdd161d4134901fefe267779a4aaaeab2f0d (patch) | |
| tree | 10889569ea16b2dd7523646ad44c85166abc5687 /Makefile.rules | |
| parent | d7283d9c54dbc45d47ee0fbed0fbdcbf0ae74f23 (diff) | |
| download | llvm-407fbdd161d4134901fefe267779a4aaaeab2f0d.tar.gz llvm-407fbdd161d4134901fefe267779a4aaaeab2f0d.tar.bz2 llvm-407fbdd161d4134901fefe267779a4aaaeab2f0d.tar.xz | |
Roll back r96959 again.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96981 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.rules b/Makefile.rules index b5b35256b7..db52985179 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -623,12 +623,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 @@ -961,16 +960,11 @@ $(LLVM_CONFIG): $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG) -ifeq ($(ENABLE_SHARED), 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 ############################################################################### # Library Build Rules: Four ways to build a library @@ -1175,13 +1169,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: |