Revert "EmulatorPkg: don't display the cpu current speed"

[mirror_edk2.git] / BaseTools / Scripts / ConvertMasmToNasm.py

diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py b/BaseTools/Scripts/ConvertMasmToNasm.py
index 3c8f994fcf7c2ec3d8066e12b043b92448da186f..0ef5a8badb94b890e5d6af281e2ae80b68bb12fc 100755 (executable)
--- a/BaseTools/Scripts/ConvertMasmToNasm.py
+++ b/BaseTools/Scripts/ConvertMasmToNasm.py
@@ -3,13 +3,7 @@
 #\r
 #  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 from __future__ import print_function\r
@@ -768,7 +762,8 @@ class ConvertInfFile(CommonUtils):
                 src = self.mo.group(1)\r
                 srcExt = self.mo.group(2)\r
                 dst = os.path.splitext(src)[0] + '.nasm'\r
-                if src not in srcToDst:\r
+                fullDst = os.path.join(self.dir, dst)\r
+                if src not in srcToDst and not os.path.exists(fullDst):\r
                     srcToDst[src] = dst\r
                     srcToDst['order'].append(src)\r
         return srcToDst\r