projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[lit] Put display lock inside the ThreadResultsConsumer.
[oota-llvm.git]
/
Makefile.rules
diff --git
a/Makefile.rules
b/Makefile.rules
index ab31808dda252d27b8a49919615523f889e89a02..ed7e0e904788fc060c0b89546aa4ebb5a6b2b4f2 100644
(file)
--- a/
Makefile.rules
+++ b/
Makefile.rules
@@
-274,13
+274,9
@@
CPP.Defines :=
ifeq ($(ENABLE_OPTIMIZED),1)
BuildMode := Release
# Don't use -fomit-frame-pointer on Darwin or FreeBSD.
ifeq ($(ENABLE_OPTIMIZED),1)
BuildMode := Release
# Don't use -fomit-frame-pointer on Darwin or FreeBSD.
- ifneq ($(HOST_OS),FreeBSD)
- ifneq ($(HOST_OS),GNU/kFreeBSD)
- ifneq ($(HOST_OS),Darwin)
+ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin FreeBSD GNU/kFreeBSD))
OmitFramePointer := -fomit-frame-pointer
endif
OmitFramePointer := -fomit-frame-pointer
endif
- endif
- endif
CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
@@
-612,17
+608,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
+1181,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