projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unbreak Mac build.
[oota-llvm.git]
/
Makefile.rules
diff --git
a/Makefile.rules
b/Makefile.rules
index ab31808dda252d27b8a49919615523f889e89a02..32b1ebcbf0525dbab780f12179e5284650d6e699 100644
(file)
--- a/
Makefile.rules
+++ b/
Makefile.rules
@@
-612,17
+612,14
@@
ifndef KEEP_SYMBOLS
Install.StripFlag += -s
endif
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))
# 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
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)
endif
else
ifneq ($(DARWIN_MAJVERS),4)
@@
-1188,7
+1185,7
@@
$(DestSharedLib): $(LibName.SO) $(DestSharedLibDir)
uninstall-local::
$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
uninstall-local::
$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
- -$(Verb) $(RM) -f $(DestSharedLib
Dir)/$(SharedPrefix)$(LIBRARYNAME).*
+ -$(Verb) $(RM) -f $(DestSharedLib
)
endif
endif
endif
endif