[llvm-commits] [llvm] r145329 - /llvm/trunk/tools/edis/Makefile

Daniel Dunbar daniel at zuster.org
Mon Nov 28 16:06:53 PST 2011


Author: ddunbar
Date: Mon Nov 28 18:06:53 2011
New Revision: 145329

URL: http://llvm.org/viewvc/llvm-project?rev=145329&view=rev
Log:
build/Make: edis isn't built as a shared library anymore, remove related cruft from the Makefile.

Modified:
    llvm/trunk/tools/edis/Makefile

Modified: llvm/trunk/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/Makefile?rev=145329&r1=145328&r2=145329&view=diff
==============================================================================
--- llvm/trunk/tools/edis/Makefile (original)
+++ llvm/trunk/tools/edis/Makefile Mon Nov 28 18:06:53 2011
@@ -9,9 +9,6 @@
 
 LEVEL := ../..
 LIBRARYNAME := EnhancedDisassembly
-LINK_LIBS_IN_SHARED := 1
-
-EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/EnhancedDisassembly.exports
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 
@@ -31,23 +28,3 @@
 endif
 
 include $(LEVEL)/Makefile.common
-
-ifeq ($(HOST_OS),Darwin)
-    # extra options to override libtool defaults 
-    LLVMLibsOptions    := $(LLVMLibsOptions)  \
-                         -Wl,-dead_strip
-
-    ifdef EDIS_VERSION
-        LLVMLibsOptions    := $(LLVMLibsOptions) -Wl,-current_version -Wl,$(EDIS_VERSION) \
-                              -Wl,-compatibility_version -Wl,1
-    endif
-
-    # 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,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
-    endif
-endif
-





More information about the llvm-commits mailing list