diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2013-08-04 22:06:11 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2013-08-04 22:06:11 +0000 |
| commit | 0cffe07771742c93b289766789f0a0c61c1b99e9 (patch) | |
| tree | 612fe34cc1d039af118ffe87c46ed2cc56237446 | |
| parent | 75311b7b4dbb284e7539c0c62331387f3c4cd1ec (diff) | |
| download | llvm-0cffe07771742c93b289766789f0a0c61c1b99e9.tar.gz llvm-0cffe07771742c93b289766789f0a0c61c1b99e9.tar.bz2 llvm-0cffe07771742c93b289766789f0a0c61c1b99e9.tar.xz | |
Build with the $RDYNAMIC flag on Darwin as well as other platforms.
Part of <rdar://problem/14620988>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187710 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 11 | ||||
| -rw-r--r-- | projects/sample/Makefile.llvm.rules | 13 |
2 files changed, 9 insertions, 15 deletions
diff --git a/Makefile.rules b/Makefile.rules index ab31808dda..735cbacdcb 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -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) diff --git a/projects/sample/Makefile.llvm.rules b/projects/sample/Makefile.llvm.rules index 0258550939..545e629cf3 100644 --- a/projects/sample/Makefile.llvm.rules +++ b/projects/sample/Makefile.llvm.rules @@ -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 |