From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D0D811A1E25 for ; Mon, 5 Sep 2016 22:22:32 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP; 05 Sep 2016 22:22:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,290,1470726000"; d="scan'208";a="4860495" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by fmsmga005.fm.intel.com with ESMTP; 05 Sep 2016 22:22:32 -0700 Received: from orsmsx162.amr.corp.intel.com (10.22.240.85) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 5 Sep 2016 22:22:32 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.118]) by ORSMSX162.amr.corp.intel.com ([169.254.3.27]) with mapi id 14.03.0248.002; Mon, 5 Sep 2016 22:22:31 -0700 From: "Mudusuru, Giri P" To: "Gao, Liming" , "edk2-devel@lists.01.org" Thread-Topic: [Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with BUILD_ prefix Thread-Index: AQHSB/Mx0NQl9rUwmkandAeCA9DgvqBr3GqQ Date: Tue, 6 Sep 2016 05:22:30 +0000 Message-ID: <4666AEFED60F8E4198B42BB01DCEABDF76ECDFE7@ORSMSX113.amr.corp.intel.com> References: <1473134387-36776-1-git-send-email-liming.gao@intel.com> <1473134387-36776-5-git-send-email-liming.gao@intel.com> In-Reply-To: <1473134387-36776-5-git-send-email-liming.gao@intel.com> Accept-Language: en-US, hi-IN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Subject: Re: [Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the specific one with BUILD_ prefix X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 05:22:33 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed the series of 4 patches Reviewed-by: Giri P Mudusuru > -----Original Message----- > From: Gao, Liming > Sent: Monday, September 5, 2016 9:00 PM > To: edk2-devel@lists.01.org > Cc: Mudusuru, Giri P ; Zhu, Yonghong > > Subject: [Patch 4/4] BaseTools VfrCompile Pccts: Update GCC Flags to the > specific one with BUILD_ prefix >=20 > This change is also applied to VfrCompile Pccts antlr and dlg tool. >=20 > In V2, add the missing C rules. >=20 > Cc: Giri P Mudusuru > Cc: Yonghong Zhu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Liming Gao > --- > BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 13 ++++++++----- > BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile | 18 +++++++++++-----= -- > 2 files changed, 19 insertions(+), 12 deletions(-) >=20 > 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=3D../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 >=20 >=20 >=20 > # > # UNIX (default) > # > -CC?=3Dgcc > +BUILD_CC?=3Dgcc > COPT=3D-O > ANTLR=3D${BIN_DIR}/antlr > DLG=3D${BIN_DIR}/dlg > OBJ_EXT=3Do > OUT_OBJ =3D -o > -CFLAGS=3D $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) - > DZZLEXBUFSIZE=3D65536 > +BUILD_CFLAGS=3D $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER)= - > DZZLEXBUFSIZE=3D65536 > +BUILD_CPPFLAGS=3D > # > # SGI Users, use this CFLAGS > # > @@ -179,7 +180,7 @@ OBJ=3Dantlr.o scan.o err.o bits.o build.o fset2.o fse= t.o > gen.o \ > globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhois= t.o > fcache.o >=20 > $(BIN_DIR)/antlr : $(OBJ) $(SRC) > - $(CC) $(CFLAGS) -o $(BIN_DIR)/antlr $(OBJ) > + $(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/antlr $(OBJ) >=20 > # what files does PCCTS generate (both ANTLR and DLG) > PCCTS_GEN=3Dantlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h r= emap.h > @@ -202,8 +203,10 @@ scan.o : scan.c mode.h tokens.h > # $(DLG) -C2 parser.dlg scan.c >=20 > 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 >=20 > +%.o : %.c > + $(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ >=20 > # > # ****** 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=3D../h > # > # UNIX > # > -CC?=3Dcc > +BUILD_CC?=3Dcc > COPT=3D-O > ANTLR=3D${BIN_DIR}/antlr > DLG=3D${BIN_DIR}/dlg > -CFLAGS=3D $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN - > DZZLEXBUFSIZE=3D65536 > +BUILD_CFLAGS=3D $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN - > DZZLEXBUFSIZE=3D65536 > +BUILD_CPPFLAGS=3D > OBJ_EXT=3Do > OUT_OBJ =3D -o > OBJ =3D dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \ > relabel.o automata.o >=20 > $(BIN_DIR)/dlg : $(OBJ) $(SRC) > - $(CC) $(CFLAGS) -o $(BIN_DIR)/dlg $(OBJ) > + $(BUILD_CC) $(BUILD_CFLAGS) -o $(BIN_DIR)/dlg $(OBJ) >=20 > SRC =3D 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 =3D dlg_p.c dlg_a.c main.c err.c $(SET)/set.c > support.c output.c \ > # $(DLG) -C2 parser.dlg dlg_a.c >=20 > 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 >=20 > 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 >=20 > main.$(OBJ_EXT) : main.c dlg.h > - $(CC) $(CFLAGS) -c main.c > + $(BUILD_CC) $(BUILD_CFLAGS) -c main.c >=20 > 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 $@ >=20 > lint: > lint *.c > -- > 2.8.0.windows.1