From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5C4381A1E10 for ; Mon, 22 Aug 2016 17:32:59 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP; 22 Aug 2016 17:32:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,563,1464678000"; d="scan'208";a="713835" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga006.fm.intel.com with ESMTP; 22 Aug 2016 17:32:51 -0700 Received: from orsmsx158.amr.corp.intel.com (10.22.240.20) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 22 Aug 2016 17:32:51 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.118]) by ORSMSX158.amr.corp.intel.com ([169.254.10.109]) with mapi id 14.03.0248.002; Mon, 22 Aug 2016 17:32:50 -0700 From: "Mudusuru, Giri P" To: "Gao, Liming" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools GnuMakefile: Update GCC Flags to the specific one with BUILD_ prefix Thread-Index: AQHR/D79cu447Thu3k699Sc9En6Qt6BVsztA Date: Tue, 23 Aug 2016 00:32:50 +0000 Message-ID: <4666AEFED60F8E4198B42BB01DCEABDF76EB7165@ORSMSX113.amr.corp.intel.com> References: <1471847543-24676-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1471847543-24676-1-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] BaseTools GnuMakefile: 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, 23 Aug 2016 00:32:59 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Giri P Mudusuru =20 > -----Original Message----- > From: Gao, Liming > Sent: Sunday, August 21, 2016 11:32 PM > To: edk2-devel@lists.01.org > Cc: Mudusuru, Giri P ; Zhu, Yonghong > > Subject: [Patch] BaseTools GnuMakefile: Update GCC Flags to the specific = one > with BUILD_ prefix >=20 > To avoid the conflict with the default GCC flag name, BUILD_ prefix is ad= ded. >=20 > Cc: Giri P Mudusuru > Cc: Yonghong Zhu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Liming Gao > --- > BaseTools/Source/C/Makefiles/footer.makefile | 8 ++++---- > BaseTools/Source/C/Makefiles/header.makefile | 28 ++++++++++++++--------= --- > --- > BaseTools/Source/C/VfrCompile/GNUmakefile | 4 ++-- > 3 files changed, 20 insertions(+), 20 deletions(-) >=20 > diff --git a/BaseTools/Source/C/Makefiles/footer.makefile > b/BaseTools/Source/C/Makefiles/footer.makefile > index c3d8020..216ae41 100644 > --- a/BaseTools/Source/C/Makefiles/footer.makefile > +++ b/BaseTools/Source/C/Makefiles/footer.makefile > @@ -21,16 +21,16 @@ install: $(MAKEROOT)/libs-$(ARCH) $(LIBRARY) > cp $(LIBRARY) $(MAKEROOT)/libs-$(ARCH) >=20 > $(LIBRARY): $(OBJECTS) > - $(AR) crs $@ $^ > + $(BUILD_AR) crs $@ $^ >=20 > %.o : %.c > - $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ > + $(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ >=20 > %.o : %.S > - $(AS) -c $(ASFLAGS) $< -o $@ > + $(BUILD_AS) -c $(BUILD_ASFLAGS) $< -o $@ >=20 > %.o : %.cpp > - $(CXX) -c $(CPPFLAGS) $< -o $@ > + $(BUILD_CXX) -c $(BUILD_CPPFLAGS) $< -o $@ >=20 > .PHONY: clean > clean: > diff --git a/BaseTools/Source/C/Makefiles/header.makefile > b/BaseTools/Source/C/Makefiles/header.makefile > index 09d2bff..5e79f31 100644 > --- a/BaseTools/Source/C/Makefiles/header.makefile > +++ b/BaseTools/Source/C/Makefiles/header.makefile > @@ -6,7 +6,7 @@ > # ARCH =3D ia64 or IA64 for IA64 build > # ARCH =3D Arm or ARM for ARM build > # > -# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
> +# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
> # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the = BSD > License > # which accompanies this distribution. The full text of the license m= ay be > found at > @@ -21,12 +21,12 @@ CYGWIN:=3D$(findstring CYGWIN, $(shell uname -s)) > LINUX:=3D$(findstring Linux, $(shell uname -s)) > DARWIN:=3D$(findstring Darwin, $(shell uname -s)) >=20 > -CC ?=3D gcc > -CXX ?=3D g++ > -AS ?=3D gcc > -AR ?=3D ar > -LD ?=3D ld > -LINKER ?=3D $(CC) > +BUILD_CC ?=3D gcc > +BUILD_CXX ?=3D g++ > +BUILD_AS ?=3D gcc > +BUILD_AR ?=3D ar > +BUILD_LD ?=3D ld > +LINKER ?=3D $(BUILD_CC) > ifeq ($(ARCH), IA32) > ARCH_INCLUDE =3D -I $(MAKEROOT)/Include/Ia32/ > endif > @@ -44,14 +44,14 @@ ARCH_INCLUDE =3D -I $(MAKEROOT)/Include/AArch64/ > endif >=20 > INCLUDE =3D $(TOOL_INCLUDE) -I $(MAKEROOT) -I > $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I > $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . > $(ARCH_INCLUDE) > -CPPFLAGS =3D $(INCLUDE) > +BUILD_CPPFLAGS =3D $(INCLUDE) > ifeq ($(DARWIN),Darwin) > # assume clang or clang compatible flags on OS X > -CFLAGS =3D -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno- > deprecated-declarations -Wno-self-assign -nostdlib -c -g > +BUILD_CFLAGS =3D -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -W= no- > deprecated-declarations -Wno-self-assign -nostdlib -c -g > else > -CFLAGS =3D -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno- > deprecated-declarations -nostdlib -c -g > +BUILD_CFLAGS =3D -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -W= no- > deprecated-declarations -nostdlib -c -g > endif > -LFLAGS =3D > +BUILD_LFLAGS =3D >=20 > ifeq ($(ARCH), IA32) > # > @@ -60,9 +60,9 @@ ifeq ($(ARCH), IA32) > # so only do this is uname -m returns i386. > # > ifeq ($(DARWIN),Darwin) > - CFLAGS +=3D -arch i386 > - CPPFLAGS +=3D -arch i386 > - LFLAGS +=3D -arch i386 > + BUILD_CFLAGS +=3D -arch i386 > + BUILD_CPPFLAGS +=3D -arch i386 > + BUILD_LFLAGS +=3D -arch i386 > endif > endif >=20 > diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile > b/BaseTools/Source/C/VfrCompile/GNUmakefile > index e446d14..e2d4321 100644 > --- a/BaseTools/Source/C/VfrCompile/GNUmakefile > +++ b/BaseTools/Source/C/VfrCompile/GNUmakefile > @@ -1,7 +1,7 @@ > ## @file > # GNU/Linux makefile for 'VfrCompile' module build. > # > -# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
> +# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
> # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the = BSD > License > # which accompanies this distribution. The full text of the license may= be found > at > @@ -24,7 +24,7 @@ TOOL_INCLUDE =3D -I Pccts/h > OBJECTS =3D AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexe= r.o > VfrSyntax.o \ > VfrFormPkg.o VfrError.o VfrUtilityLib.o VfrCompiler.o >=20 > -VFR_CPPFLAGS =3D -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS) > +VFR_CPPFLAGS =3D -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS) >=20 > LINKER =3D $(CXX) >=20 > -- > 2.8.0.windows.1