summaryrefslogtreecommitdiff
path: root/BaseTools
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2016-05-30 18:48:50 -0700
committerHao Wu <hao.a.wu@intel.com>2016-07-13 09:34:05 +0800
commit1d4f9134f786f8e376c1ad51b5ef0702f2996b27 (patch)
tree4aba9357fca2db405b081da97782aed62ceb58be /BaseTools
parent14bff3d7536b522160981fc1c5e76f496addad9c (diff)
downloadedk2-platforms-1d4f9134f786f8e376c1ad51b5ef0702f2996b27.tar.xz
BaseTools ConvertMasmToNasm: Don't try to reconvert .nasm files
We now check to see if the destination .nasm file already exists. If it does, then we don't try to convert the .asm to .nasm. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> (cherry picked from commit ad00b0452e0c6cf09aecfe1b0cf64d81f191a507)
Diffstat (limited to 'BaseTools')
-rwxr-xr-xBaseTools/Scripts/ConvertMasmToNasm.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py b/BaseTools/Scripts/ConvertMasmToNasm.py
index 3c8f994fcf..5b83724b31 100755
--- a/BaseTools/Scripts/ConvertMasmToNasm.py
+++ b/BaseTools/Scripts/ConvertMasmToNasm.py
@@ -768,7 +768,8 @@ class ConvertInfFile(CommonUtils):
src = self.mo.group(1)
srcExt = self.mo.group(2)
dst = os.path.splitext(src)[0] + '.nasm'
- if src not in srcToDst:
+ fullDst = os.path.join(self.dir, dst)
+ if src not in srcToDst and not os.path.exists(fullDst):
srcToDst[src] = dst
srcToDst['order'].append(src)
return srcToDst