Allow users to set CPPFLAGS and CXXFLAGS on the make command line.

Tested: make CPPFLAGS=-m64 CXXFLAGS=-m64 -j8 && (cd tools/clang;make test)

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

diff --git a/lib/AST/Makefile b/lib/AST/Makefile
index 8afc629d6b3b7987df682971183802a7b14cf5d1..ede25777c90b844ce618e716290534f8c61d6c85 100644 (file)
--- a/lib/AST/Makefile
+++ b/lib/AST/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangAST
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Analysis/Makefile b/lib/Analysis/Makefile
index d6411122e32288ec25a88f5ff86b1c2441ad38ef..9b473803fa92185578833d39459324c75a1cbfd0 100644 (file)
--- a/lib/Analysis/Makefile
+++ b/lib/Analysis/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangAnalysis
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Checker/Makefile b/lib/Checker/Makefile
index 673d152270ca55ae31db3bf364d5175253e5d147..c45ab294dec4f41212916e2b24323b32f7751208 100644 (file)
--- a/lib/Checker/Makefile
+++ b/lib/Checker/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangChecker
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index 83cb36738709f4a52bdbd5844bf6b25fe9cd16a4..3cea6bbd9f06ff8aa7ec45dc0703eeef0a8cd214 100644 (file)
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@@ -16,9 +16,9 @@ LEVEL = ../../../..
 LIBRARYNAME := clangCodeGen
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 ifdef CLANG_VENDOR
-CPPFLAGS += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
+CPP.Flags += -DCLANG_VENDOR='"$(CLANG_VENDOR) "'
 endif
 
 include $(LEVEL)/Makefile.common

diff --git a/lib/Frontend/Makefile b/lib/Frontend/Makefile
index a630b0133632d542881524a6db8ceaf360902bcf..9e1a864d96e35ff3f27aa6b26cff8718639973f0 100644 (file)
--- a/lib/Frontend/Makefile
+++ b/lib/Frontend/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangFrontend
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Index/Makefile b/lib/Index/Makefile
index 9d33a2d175e3cd9976fc7cf1778e45bf8f2a79ea..4d8671361cdff90e8f954ca445fa938a971f8184 100644 (file)
--- a/lib/Index/Makefile
+++ b/lib/Index/Makefile
@@ -18,10 +18,10 @@ LIBRARYNAME := clangIndex
 BUILD_ARCHIVE = 1
 
 ifeq ($(ARCH),PowerPC)
-CXXFLAGS += -maltivec
+CXX.Flags += -maltivec
 endif
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Lex/Makefile b/lib/Lex/Makefile
index 509077017c2d9e1d0b44e0c268931ab7dd876f49..bd3c7a872d3ad5466d89917318af4e0bc871c3b5 100644 (file)
--- a/lib/Lex/Makefile
+++ b/lib/Lex/Makefile
@@ -18,10 +18,10 @@ LIBRARYNAME := clangLex
 BUILD_ARCHIVE = 1
 
 ifeq ($(ARCH),PowerPC)
-CXXFLAGS += -maltivec
+CXX.Flags += -maltivec
 endif
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Parse/Makefile b/lib/Parse/Makefile
index de16e3ea665ad1cf09533c69beb5745d377236a5..6a5540f73356cb9dcff955474342b614817cafb7 100644 (file)
--- a/lib/Parse/Makefile
+++ b/lib/Parse/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangParse
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Rewrite/Makefile b/lib/Rewrite/Makefile
index a6d3f7725689a56a70402149aa4f21c49f3b4f84..04c353090dc7b277d8f82279b2a61c6dc1a06786 100644 (file)
--- a/lib/Rewrite/Makefile
+++ b/lib/Rewrite/Makefile
@@ -15,7 +15,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangRewrite
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/lib/Sema/Makefile b/lib/Sema/Makefile
index 158f1af213d44c12c411e530dbce3925136f89c4..3a5a99ad576ad874e9db7b74b75247f151f8fc8f 100644 (file)
--- a/lib/Sema/Makefile
+++ b/lib/Sema/Makefile
@@ -16,7 +16,7 @@ LEVEL = ../../../..
 LIBRARYNAME := clangSema
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/CIndex/Makefile b/tools/CIndex/Makefile
index 3e288623e5eb3b1d9a941e47ee5ef0366f484e79..650bcd3645d21297d7a364b7ddc53c1cbe080720 100644 (file)
--- a/tools/CIndex/Makefile
+++ b/tools/CIndex/Makefile
@@ -10,7 +10,7 @@
 LEVEL = ../../../..
 LIBRARYNAME = CIndex
 
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 # Include this here so we can get the configuration of the targets
 # that have been configured for construction. We have to do this 

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index e5a9280a0cbe298017dff5c526be756a73c8caeb..6434cb4ef551b3a3b8b788aae4ede8ee464c3a30 100644 (file)
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -12,7 +12,7 @@ TOOLNAME = clang
 ifndef CLANG_IS_PRODUCTION
 TOOLALIAS = clang++
 endif
-CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
+CPP.Flags += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 
 # Clang tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS = 1