Re: [Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with BUILD_ prefix

["Mudusuru, Giri P" <giri.p.mudusuru@intel.com>]

Reviewed the series of 4 patches
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>


> -----Original Message-----
> From: Gao, Liming
> Sent: Monday, September 5, 2016 9:00 PM
> To: edk2-devel@lists.01.org
> Cc: Mudusuru, Giri P <giri.p.mudusuru@intel.com>; Zhu, Yonghong
> <yonghong.zhu@intel.com>
> Subject: [Patch 4/4] 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>
> ---
>  BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 13 ++++++++-----
>  BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile   | 18 +++++++++++-------
>  2 files changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
> b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile
> index c49cfd8..8f2cc78 100644
> --- 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
>  #
>  #set.$(OBJ_EXT): $(SET)/set.c
> -#	$(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c
> +#	$(BUILD_CC) $(BUILD_CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT)
> $(SET)/set.c
> 
> 
> 
>  #
>  #   UNIX  (default)
>  #
> -CC?=gcc
> +BUILD_CC?=gcc
>  COPT=-O
>  ANTLR=${BIN_DIR}/antlr
>  DLG=${BIN_DIR}/dlg
>  OBJ_EXT=o
>  OUT_OBJ = -o
> -CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -
> DZZLEXBUFSIZE=65536
> +BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -
> DZZLEXBUFSIZE=65536
> +BUILD_CPPFLAGS=
>  #
>  # SGI Users, use this CFLAGS
>  #
> @@ -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
> 
>  $(BIN_DIR)/antlr : $(OBJ) $(SRC)
> -		$(CC) $(CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)
> +		$(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)
> 
>  # what files does PCCTS generate (both ANTLR and DLG)
>  PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
> @@ -202,8 +203,10 @@ scan.o : scan.c mode.h tokens.h
>  #	$(DLG) -C2 parser.dlg scan.c
> 
>  set.o : $(SET)/set.c
> -	$(CC) $(CFLAGS) -c -o set.o $(SET)/set.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c -o set.o $(SET)/set.c
> 
> +%.o : %.c
> +	$(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
> 
>  #
>  # ****** These next targets are common to UNIX and PC world ********
> diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> index dfcf3ee..b3a34d3 100644
> --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile
> @@ -114,18 +114,19 @@ PCCTS_H=../h
>  #
>  #   UNIX
>  #
> -CC?=cc
> +BUILD_CC?=cc
>  COPT=-O
>  ANTLR=${BIN_DIR}/antlr
>  DLG=${BIN_DIR}/dlg
> -CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -
> DZZLEXBUFSIZE=65536
> +BUILD_CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -
> DZZLEXBUFSIZE=65536
> +BUILD_CPPFLAGS=
>  OBJ_EXT=o
>  OUT_OBJ = -o
>  OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
>          relabel.o automata.o
> 
>  $(BIN_DIR)/dlg : $(OBJ) $(SRC)
> -		$(CC) $(CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)
> +		$(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/dlg $(OBJ)
> 
>  SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
>          relabel.c automata.c
> @@ -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
> 
>  dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
> -	$(CC) $(CFLAGS) -c dlg_p.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c dlg_p.c
> 
>  dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
> -	$(CC) $(CFLAGS) -c dlg_a.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c dlg_a.c
> 
>  main.$(OBJ_EXT) : main.c dlg.h
> -	$(CC) $(CFLAGS) -c main.c
> +	$(BUILD_CC) $(BUILD_CFLAGS) -c main.c
> 
>  set.$(OBJ_EXT) : $(SET)/set.c
> -	$(CC) -c $(CFLAGS) $(SET)/set.c
> +	$(BUILD_CC) -c $(BUILD_CFLAGS) $(SET)/set.c
> +
> +%.o : %.c
> +	$(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
> 
>  lint:
>  	lint *.c
> --
> 2.8.0.windows.1