[llvm] r187710 - Build with the $RDYNAMIC flag on Darwin as well as other platforms.
Bob Wilson
bob.wilson at apple.com
Sun Aug 4 15:06:11 PDT 2013
Author: bwilson
Date: Sun Aug 4 17:06:11 2013
New Revision: 187710
URL: http://llvm.org/viewvc/llvm-project?rev=187710&view=rev
Log:
Build with the $RDYNAMIC flag on Darwin as well as other platforms.
Part of <rdar://problem/14620988>
Modified:
llvm/trunk/Makefile.rules
llvm/trunk/projects/sample/Makefile.llvm.rules
Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=187710&r1=187709&r2=187710&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sun Aug 4 17:06:11 2013
@@ -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)
Modified: llvm/trunk/projects/sample/Makefile.llvm.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/sample/Makefile.llvm.rules?rev=187710&r1=187709&r2=187710&view=diff
==============================================================================
--- llvm/trunk/projects/sample/Makefile.llvm.rules (original)
+++ llvm/trunk/projects/sample/Makefile.llvm.rules Sun Aug 4 17:06:11 2013
@@ -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
More information about the llvm-commits
mailing list