diff options
| -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 ab31808..735cbac 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 0258550..545e629 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 |