From a9355bb81ad43231c978431ecf0abbe5cfb3a1fa Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Wed, 31 Aug 2016 12:44:50 +0800 Subject: [PATCH] BaseTools GNU makefile: Add BUILD_CXXFLAGS to align make built-in rule MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit GNU make built-in rule to Compiling C++ programs with ‘$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c’. To align to it, add empty BUILD_CXXFLAGS in cpp rule. Cc: Giri P Mudusuru Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao Reviewed-by: Giri P Mudusuru Reviewed-by: Yonghong Zhu --- BaseTools/Source/C/Makefiles/footer.makefile | 2 +- BaseTools/Source/C/Makefiles/header.makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile index 216ae418f8..a58bff667d 100644 --- a/BaseTools/Source/C/Makefiles/footer.makefile +++ b/BaseTools/Source/C/Makefiles/footer.makefile @@ -30,7 +30,7 @@ $(LIBRARY): $(OBJECTS) $(BUILD_AS) -c $(BUILD_ASFLAGS) $< -o $@ %.o : %.cpp - $(BUILD_CXX) -c $(BUILD_CPPFLAGS) $< -o $@ + $(BUILD_CXX) -c $(BUILD_CPPFLAGS) $(BUILD_CXXFLAGS) $< -o $@ .PHONY: clean clean: diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index 5e79f31299..f2041f8f03 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -52,6 +52,7 @@ else BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -nostdlib -c -g endif BUILD_LFLAGS = +BUILD_CXXFLAGS = ifeq ($(ARCH), IA32) # -- 2.39.2