6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-12 18:33:22 +00:00
Code Issues Projects Releases Wiki Activity

Updated the install location for EnhancedDisassembly

Browse Source 
on Mac OS X to use @rpath rather than an absolute
path.  Also allowed the version to be set using an
environment variable.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100163 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Callanan 2010-04-02 00:53:42 +00:00
parent 04d52f8435
commit eb3a1ab796
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/edis/Makefile
View File

@ -25,26 +25,23 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common
ifeq ($(HOST_OS),Darwin) 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
# extra options to override libtool defaults # extra options to override libtool defaults
LLVMLibsOptions := $(LLVMLibsOptions) \ LLVMLibsOptions := $(LLVMLibsOptions) \
-avoid-version \ -avoid-version \
-Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/EnhancedDisassembly.exports \ -Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/EnhancedDisassembly.exports \
-Wl,-dead_strip \ -Wl,-dead_strip
-Wl,-seg1addr -Wl,0xE0000000
ifdef EDIS_VERSION
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 # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
# Path is /Developer/usr/local/lib for now; will use an rpath-based mechanism soon
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
ifneq ($(DARWIN_VERS),8) ifneq ($(DARWIN_VERS),8)
LLVMLibsOptions := $(LLVMLibsOptions) \ LLVMLibsOptions := $(LLVMLibsOptions) \
-no-undefined -Wl,-install_name \ -no-undefined -Wl,-install_name \
-Wl,"/Developer/usr/local/lib/lib$(LIBRARYNAME)$(SHLIBEXT)" -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
endif endif
endif endif