BaseTools/Source/C: split "-O2" to BUILD_OPTFLAGS

The option "-O2" is not a preprocessor flag, but a code generation
(compilation) flag. Move it from BUILD_CPPFLAGS to BUILD_CFLAGS and
BUILD_CXXFLAGS.

Because "VfrCompile/GNUmakefile" uses "-O2" through BUILD_CPPFLAGS, and
because it doesn't use BUILD_CXXFLAGS, we have to introduce BUILD_OPTFLAGS
separately, so that "VfrCompile/GNUmakefile" can continue using just this
flag.

This patch doesn't change behavior.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 08421ba24cd9a179aaf10dc616030e792d00ccca..498c6cf48b4a42fcd19dc52a5513e81934f0f880 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -68,7 +68,8 @@ $(error Bad HOST_ARCH)
 endif\r
 \r
 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) \r
-BUILD_CPPFLAGS = $(INCLUDE) -O2\r
+BUILD_CPPFLAGS = $(INCLUDE)\r
+BUILD_OPTFLAGS = -O2\r
 ifeq ($(DARWIN),Darwin)\r
 # assume clang or clang compatible flags on OS X\r
 BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g\r
@@ -91,6 +92,9 @@ ifeq ($(DARWIN),Darwin)
 endif\r
 endif\r
 \r
+# keep BUILD_OPTFLAGS last\r
+BUILD_CFLAGS   += $(BUILD_OPTFLAGS)\r
+BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)\r
   \r
 .PHONY: all\r
 .PHONY: install\r

diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index c4ec61aa6c862ef9d3a1972a7b8eea0c0479fd01..bbe562cbc54f72fbc22d706f9de94be46ebdc21b 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -25,6 +25,9 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyn
 \r
 VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS)\r
 \r
+# keep BUILD_OPTFLAGS last\r
+VFR_CXXFLAGS = $(BUILD_OPTFLAGS)\r
+\r
 LINKER = $(BUILD_CXX)\r
 \r
 EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h\r
@@ -58,16 +61,16 @@ Pccts/dlg/dlg:
        BIN_DIR='.' $(MAKE) -C Pccts/dlg\r
 \r
 ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp\r
-       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@\r
+       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@\r
 \r
 DLexerBase.o: Pccts/h/DLexerBase.cpp\r
-       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@\r
+       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@\r
 \r
 AParser.o: Pccts/h/AParser.cpp\r
-       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@\r
+       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@\r
 \r
 VfrSyntax.o: VfrSyntax.cpp\r
-       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@\r
+       $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@\r
        \r
 clean: localClean\r
 \r