Don't build Debug/ versions when ENABLE_OPTIMIZED is on.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3216 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index 74c865a67a968ded45873d97b7209052602cf8b5..b13db1802d8b526bfe3fd2412cfb0c0981d5a7bb 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -78,7 +78,7 @@ endif
 CompileCommonOpts = $(PROFILE) -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
 
 # Compile a file, don't link...
-Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) $(PROFILE)
+Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
 CompileG = $(Compile) -g  -D_DEBUG
 CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums
 
@@ -160,6 +160,8 @@ LIBNAME_AG   := $(LIBDEBUG)/lib$(LIBRARYNAME).a
 LIBNAME_OBJO := $(LIBRELEASE)/$(LIBRARYNAME).o
 LIBNAME_OBJG := $(LIBDEBUG)/$(LIBRARYNAME).o
 
+
+ifndef ENABLE_OPTIMIZED
 BUILD_LIBNAME_G := $(LIBNAME_G)
 ifndef DONT_BUILD_RELINKED
 BUILD_LIBNAME_OBJG := $(LIBNAME_OBJG)
@@ -167,6 +169,7 @@ endif
 ifdef BUILD_ARCHIVE
 BUILD_LIBNAME_AG := $(LIBNAME_AG)
 endif
+endif
 
 # If optimized builds are enabled...
 ifdef ENABLE_OPTIMIZED

diff --git a/Makefile.rules b/Makefile.rules
index 74c865a67a968ded45873d97b7209052602cf8b5..b13db1802d8b526bfe3fd2412cfb0c0981d5a7bb 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -78,7 +78,7 @@ endif
 CompileCommonOpts = $(PROFILE) -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
 
 # Compile a file, don't link...
-Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) $(PROFILE)
+Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
 CompileG = $(Compile) -g  -D_DEBUG
 CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums
 
@@ -160,6 +160,8 @@ LIBNAME_AG   := $(LIBDEBUG)/lib$(LIBRARYNAME).a
 LIBNAME_OBJO := $(LIBRELEASE)/$(LIBRARYNAME).o
 LIBNAME_OBJG := $(LIBDEBUG)/$(LIBRARYNAME).o
 
+
+ifndef ENABLE_OPTIMIZED
 BUILD_LIBNAME_G := $(LIBNAME_G)
 ifndef DONT_BUILD_RELINKED
 BUILD_LIBNAME_OBJG := $(LIBNAME_OBJG)
@@ -167,6 +169,7 @@ endif
 ifdef BUILD_ARCHIVE
 BUILD_LIBNAME_AG := $(LIBNAME_AG)
 endif
+endif
 
 # If optimized builds are enabled...
 ifdef ENABLE_OPTIMIZED