diff options
| -rw-r--r-- | Makefile.rules | 14 | ||||
| -rw-r--r-- | docs/MakefileGuide.html | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.rules b/Makefile.rules index a160c02d30..f5cfb0a157 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -146,20 +146,24 @@ install-bytecode:: install-bytecode-local # Variables derived from configuration we are building #-------------------------------------------------------------------- +CommonCXXOpts := -Woverloaded-virtual + ifdef ENABLE_PROFILING BuildMode := Profile - CXX.Flags := -O3 -DNDEBUG -felide-constructors -finline-functions -pg + CXX.Flags := -O3 -DNDEBUG $(CommonCXXOpts) -felide-constructors \ + -finline-functions -pg C.Flags := -O3 -DNDEBUG -pg LD.Flags := -O3 -DNDEBUG -pg else ifdef ENABLE_OPTIMIZED BuildMode := Release - CXX.Flags := -O3 -DNDEBUG -finline-functions -felide-constructors -fomit-frame-pointer + CXX.Flags := -O3 -DNDEBUG $(CommonCXXOpts) -finline-functions \ + -felide-constructors -fomit-frame-pointer C.Flags := -O3 -DNDEBUG -fomit-frame-pointer LD.Flags := -O3 -DNDEBUG else BuildMode := Debug - CXX.Flags := -g -D_DEBUG + CXX.Flags := -g -D_DEBUG $(CommonCXXOpts) C.Flags := -g -D_DEBUG LD.Flags := -g -D_DEBUG KEEP_SYMBOLS := 1 @@ -214,10 +218,6 @@ ifndef LLVMGXX LLVMGXX := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++ endif -# Need a better way to compute this. -LLVMGCCLibDir := $(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))/ -LLVMGCCStdCXXLibDir := $(dir $(shell $(LLVMGCC) -print-file-name=libstdc++.a))/ - #-------------------------------------------------------------------- # Adjust to user's request #-------------------------------------------------------------------- diff --git a/docs/MakefileGuide.html b/docs/MakefileGuide.html index 8ba3f2a750..42c2b1cea9 100644 --- a/docs/MakefileGuide.html +++ b/docs/MakefileGuide.html @@ -906,8 +906,6 @@ LibTool.Flags Link LinkModule - LLVMGCCLibDir - LLVMGCCStdCXXLibDir LLVMLibDir LLVMLibsOptions LLVMLibsPaths |