tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Support customized compiling command 

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1737
User may add other commands before CC command from build_rule.txt
for specific purpose. It worked fine before commit 05217d210e.

This patch is going to fix the bug in commit 05217d210e to
support customized CC command.

Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Bob Feng 2019-04-23 11:21:22 +08:00 committed by Feng, Bob C
parent dfaa565559
commit c9b3fe1586
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BaseTools/Source/Python/AutoGen/GenMake.py
View File

@ -1023,7 +1023,7 @@ cleanlib:
CommandList = T.Commands[:] CommandList = T.Commands[:]
for Item in CommandList[:]: for Item in CommandList[:]:
SingleCommandList = Item.split() SingleCommandList = Item.split()
if len(SingleCommandList) > 0 and '$(CC)' in SingleCommandList[0]: if len(SingleCommandList) > 0 and self.CheckCCCmd(SingleCommandList):
for Temp in SingleCommandList: for Temp in SingleCommandList:
if Temp.startswith('/Fo'): if Temp.startswith('/Fo'):
CmdSign = '%s%s' % (Temp.rsplit(TAB_SLASH, 1)[0], TAB_SLASH) CmdSign = '%s%s' % (Temp.rsplit(TAB_SLASH, 1)[0], TAB_SLASH)
@ -1043,6 +1043,11 @@ cleanlib:
T.Commands.pop(Index) T.Commands.pop(Index)
return T, CmdSumDict, CmdTargetDict, CmdCppDict return T, CmdSumDict, CmdTargetDict, CmdCppDict
def CheckCCCmd(self, CommandList):
for cmd in CommandList:
if '$(CC)' in cmd:
return True
return False
## For creating makefile targets for dependent libraries ## For creating makefile targets for dependent libraries
def ProcessDependentLibrary(self): def ProcessDependentLibrary(self):
for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList: for LibraryAutoGen in self._AutoGenObject.LibraryAutoGenList: