From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web10.4855.1601427441353342286 for ; Tue, 29 Sep 2020 17:57:22 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Wed, 30 Sep 2020 08:57:15 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Feng, Bob C'" , Cc: "'Chen, Christine'" References: <20200916010301.1247-1-gaoliming@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0ggMS8xXSBCYXNlVG9vbHM6IE1vdmUgQyB0b29sIGZsYWdzIGJlZm9yZSB0aGUgY29tbW9uIGZsYWdz?= Date: Wed, 30 Sep 2020 08:57:17 +0800 Message-ID: <004601d696c4$a504f410$ef0edc30$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQGLp9AIwfuQVpm0VFlBPjwRvWcWZAFTKTsIqgufQAA= Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Bob: In edk2\BaseTools\Source\C\Makefiles\header.makefile, TOOL_INCLUDE is = the first include directory.=20 So, I update DscBuildData.py to generate Edk2 source package include directory to TOOL_INCLUDE macro.=20 Then, PcdValueInit will search the definition from Edk2 source package first.=20 Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Feng, Bob C > =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA9=D4=C229=C8=D5 15:50 > =CA=D5=BC=FE=C8=CB: Liming Gao ; = devel@edk2.groups.io > =B3=AD=CB=CD: Chen, Christine > =D6=F7=CC=E2: RE: [PATCH 1/1] BaseTools: Move C tool flags before the = common flags >=20 > Hi Liming, >=20 > Would you explain the purpose of the change done in DscBuildData.py? >=20 > Thanks, > Bob >=20 > -----Original Message----- > From: Liming Gao > Sent: Wednesday, September 16, 2020 9:03 AM > To: devel@edk2.groups.io > Cc: Chen, Christine ; Feng, Bob C > > Subject: [PATCH 1/1] BaseTools: Move C tool flags before the common = flags >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2938 >=20 > C tool may add the additional INC include path. They should have high priority > than the common INC include path. > This fix is to resolve the structure PCD issue to refer to the same = header file > defined in BaseTools and MdePkg. The one in MdePkg should be used. >=20 > Cc: Yuwei Chen > Cc: Bob Feng > Signed-off-by: Liming Gao > --- > BaseTools/Source/C/Makefiles/ms.common | 2 +- > BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/C/Makefiles/ms.common > b/BaseTools/Source/C/Makefiles/ms.common > index f5f77fdc0bc5..b2dbcf376c04 100644 > --- a/BaseTools/Source/C/Makefiles/ms.common > +++ b/BaseTools/Source/C/Makefiles/ms.common > @@ -55,7 +55,7 @@ AR =3D lib.exe > LD =3D link.exe > LINKER =3D $(LD) >=20 > -INC =3D -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I > $(SOURCE_PATH)\Common $(INC) > +INC =3D $(INC) -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I > +$(SOURCE_PATH)\Common >=20 > CFLAGS =3D $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D > _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE > CPPFLAGS =3D $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D > _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE diff > --git a/BaseTools/Source/Python/Workspace/DscBuildData.py > b/BaseTools/Source/Python/Workspace/DscBuildData.py > index 1afbd3eefc6c..eba65625337a 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -2639,7 +2639,7 @@ class DscBuildData(PlatformBuildClassObject): > else: > MakeApp =3D MakeApp + PcdGccMakefile > MakeApp =3D MakeApp + 'APPFILE =3D %s/%s\n' % > (self.OutputPath, PcdValueInitName) + 'APPNAME =3D %s\n' % > (PcdValueInitName) + 'OBJECTS =3D %s/%s.o %s.o\n' % (self.OutputPath, > PcdValueInitName, os.path.join(self.OutputPath, PcdValueCommonName)) + = \ > - 'include > $(MAKEROOT)/Makefiles/app.makefile\n' + 'INCLUDE +=3D' > + 'include > $(MAKEROOT)/Makefiles/app.makefile\n' + 'TOOL_INCLUDE +=3D' >=20 > IncSearchList =3D [] > PlatformInc =3D OrderedDict() > -- > 2.27.0.windows.1 >=20