maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Build with the $RDYNAMIC flag on Darwin as well as other platforms. 

Part of <rdar://problem/14620988>

llvm-svn: 187710
This commit is contained in:
Bob Wilson 2013-08-04 22:06:11 +00:00
parent 40f2fa9a45
commit 9fcf545575
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/Makefile.rules
View File

@ -612,17 +612,14 @@ ifndef KEEP_SYMBOLS
Install.StripFlag += -s
endif
ifdef TOOL_NO_EXPORTS
DynamicFlags :=
else
DynamicFlag := $(RDYNAMIC)
endif
# Adjust linker flags for building an executable
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
ifndef TOOL_NO_EXPORTS
LD.Flags += $(RDYNAMIC)
endif
ifneq ($(HOST_OS), Darwin)
ifdef TOOLNAME
LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
endif
else
ifneq ($(DARWIN_MAJVERS),4)

13
llvm/projects/sample/Makefile.llvm.rules
View File

@ -534,21 +534,18 @@ ifndef KEEP_SYMBOLS
Install.StripFlag += -s
endif
ifdef TOOL_NO_EXPORTS
DynamicFlags :=
else
DynamicFlag := $(RDYNAMIC)
endif
# Adjust linker flags for building an executable
ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
ifndef TOOL_NO_EXPORTS
LD.Flags += $(RDYNAMIC)
endif
ifneq ($(HOST_OS), Darwin)
ifdef TOOLNAME
LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
ifdef EXAMPLE_TOOL
LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
LD.Flags += $(RPATH) -Wl,$(ExmplDir)
else
LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
LD.Flags += $(RPATH) -Wl,$(ToolDir)
endif
endif
else