summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhu, Yonghong <yonghong.zhu@intel.com>2017-12-29 08:28:17 +0800
committerLiming Gao <liming.gao@intel.com>2017-12-29 11:07:56 +0800
commitf13f306b3b07330191ba4620e49c2a9151b8e575 (patch)
tree6e46cc1aaffef59dd45e7c1b2fa044ff32c00618
parenta743986df89b60ae49e970cdb81fac4575e87342 (diff)
downloadedk2-f13f306b3b07330191ba4620e49c2a9151b8e575.zip
edk2-f13f306b3b07330191ba4620e49c2a9151b8e575.tar.gz
edk2-f13f306b3b07330191ba4620e49c2a9151b8e575.tar.bz2
BaseTools: Fix the bug for QuarkPlatformPkg build failure
The issue is that the string 'LPC' starts with the 'L' character and this is being confused with L" or L' for a Unicode string or Unicode character. Fixes:https://bugzilla.tianocore.org/show_bug.cgi?id=831 Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--BaseTools/Source/Python/Common/Expression.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 953a412..55fa06d 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -164,7 +164,7 @@ class ValueExpression(object):
else:
Oprand1,Size = ParseFieldValue('"' + Oprand1 + '"')
if type(Oprand2) == type(''):
- if Oprand2[0] in ['"', "'", 'L'] or Oprand2.startswith('UINT'):
+ if Oprand2[0] in ['"', "'"] or Oprand2.startswith('L"') or Oprand2.startswith("L'") or Oprand2.startswith('UINT'):
Oprand2, Size = ParseFieldValue(Oprand2)
else:
Oprand2, Size = ParseFieldValue('"' + Oprand2 + '"')