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 /tools | |
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 'tools')
-rw-r--r-- | tools/llvm-shlib/Makefile | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/tools/llvm-shlib/Makefile b/tools/llvm-shlib/Makefile deleted file mode 100644 index b2f725c..0000000 --- a/tools/llvm-shlib/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -##===- tools/shlib/Makefile --------------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../.. -LIBRARYNAME = LLVM$(LLVMVersion) - -NO_BUILD_ARCHIVE = 1 -LINK_LIBS_IN_SHARED = 1 -SHARED_LIBRARY = 1 - -include $(LEVEL)/Makefile.common - -# Include all archives in libLLVM.(so|dylib) except the ones that have -# their own dynamic libraries. -Archives := $(wildcard $(LibDir)/libLLVM*.a) -SharedLibraries := $(wildcard $(LibDir)/libLLVM*$(SHLIBEXT)) -IncludeInLibLlvm := $(filter-out $(basename $(SharedLibraries)).a, $(Archives)) -LLVMLibsOptions := $(IncludeInLibLlvm:$(LibDir)/lib%.a=-l%) -LLVMLibsPaths := $(IncludeInLibLlvm) - -$(LibName.SO): $(LLVMLibsPaths) - -ifeq ($(HOST_OS),Darwin) - # set dylib internal version number to llvmCore submission number - ifdef LLVM_SUBMIT_VERSION - LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \ - -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) \ - -Wl,-compatibility_version -Wl,1 - endif - # Include everything from the .a's into the shared library. - LLVMLibsOptions := $(LLVMLibsOptions) \ - -Wl,-all_load - # extra options to override libtool defaults - LLVMLibsOptions := $(LLVMLibsOptions) \ - -avoid-version \ - -Wl,-dead_strip \ - -Wl,-seg1addr -Wl,0xE0000000 - - # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line - DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') - ifneq ($(DARWIN_VERS),8) - LLVMLibsOptions := $(LLVMLibsOptions) \ - -Wl,-install_name \ - -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" - endif -endif - -ifeq ($(HOST_OS), Linux) - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive - # Don't allow unresolved symbols, and warn if we'll need to modify - # the text segment when loading libLLVM.so. - LLVMLibsOptions += -Wl,--no-undefined,--warn-shared-textrel -endif |