BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with BUILD_ prefix

This change is also applied to VfrCompile Pccts antlr and dlg tool.

In V2, add the missing C rules.

Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
index c49cfd8fb2ec9e4bfc2739d96984f7cfb59bcfc6..8f2cc78c59475c3ba1d73723dd342f84a9631bb0 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
@@ -157,20 +157,21 @@ PCCTS_H=../h
 #      $(DLG) -C2 parser.dlg scan.c\r
 #\r
 #set.$(OBJ_EXT): $(SET)/set.c\r
-#      $(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c\r
+#      $(BUILD_CC) $(BUILD_CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c\r
 \r
 \r
 \r
 #\r
 #   UNIX  (default)\r
 #\r
-CC?=gcc\r
+BUILD_CC?=gcc\r
 COPT=-O\r
 ANTLR=${BIN_DIR}/antlr\r
 DLG=${BIN_DIR}/dlg\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r
-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536\r
+BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536\r
+BUILD_CPPFLAGS=\r
 #\r
 # SGI Users, use this CFLAGS\r
 #\r
@@ -179,7 +180,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o\r
 \r
 $(BIN_DIR)/antlr : $(OBJ) $(SRC)\r
-               $(CC) $(CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)\r
+               $(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)\r
 \r
 # what files does PCCTS generate (both ANTLR and DLG)\r
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h\r
@@ -202,8 +203,10 @@ scan.o : scan.c mode.h tokens.h
 #      $(DLG) -C2 parser.dlg scan.c\r
 \r
 set.o : $(SET)/set.c\r
-       $(CC) $(CFLAGS) -c -o set.o $(SET)/set.c\r
+       $(BUILD_CC) $(BUILD_CFLAGS) -c -o set.o $(SET)/set.c\r
 \r
+%.o : %.c \r
+       $(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@\r
 \r
 #\r
 # ****** These next targets are common to UNIX and PC world ********\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
index dfcf3eebeb65bcbb1642ab1d24578f0d5077c456..b3a34d3b46132fd62a27bd185949e51a0768d32e 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
@@ -114,18 +114,19 @@ PCCTS_H=../h
 #\r
 #   UNIX\r
 #\r
-CC?=cc\r
+BUILD_CC?=cc\r
 COPT=-O\r
 ANTLR=${BIN_DIR}/antlr\r
 DLG=${BIN_DIR}/dlg\r
-CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536\r
+BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536\r
+BUILD_CPPFLAGS=\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r
 OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \\r
         relabel.o automata.o\r
 \r
 $(BIN_DIR)/dlg : $(OBJ) $(SRC)\r
-               $(CC) $(CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)\r
+               $(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)\r
 \r
 SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \\r
         relabel.c automata.c\r
@@ -137,16 +138,19 @@ SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
 #      $(DLG) -C2 parser.dlg dlg_a.c\r
 \r
 dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h\r
-       $(CC) $(CFLAGS) -c dlg_p.c\r
+       $(BUILD_CC) $(BUILD_CFLAGS) -c dlg_p.c\r
 \r
 dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h\r
-       $(CC) $(CFLAGS) -c dlg_a.c\r
+       $(BUILD_CC) $(BUILD_CFLAGS) -c dlg_a.c\r
 \r
 main.$(OBJ_EXT) : main.c dlg.h\r
-       $(CC) $(CFLAGS) -c main.c\r
+       $(BUILD_CC) $(BUILD_CFLAGS) -c main.c\r
 \r
 set.$(OBJ_EXT) : $(SET)/set.c\r
-       $(CC) -c $(CFLAGS) $(SET)/set.c\r
+       $(BUILD_CC) -c $(BUILD_CFLAGS) $(SET)/set.c\r
+\r
+%.o : %.c \r
+       $(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@\r
 \r
 lint:\r
        lint *.c\r