BaseTools: Clear build versions to sync with buildtools/BaseTools

[mirror_edk2.git] / BaseTools / Source / Python / Common / ToolDefClassObject.py

diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 5a9a3096bb6a0e0c45f104d06d261a84ee84a12e..0f49457449cd698d1e972ab38ca5f04d86066204 100644 (file)
--- a/BaseTools/Source/Python/Common/ToolDefClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py
@@ -1,8 +1,8 @@
 ## @file\r
 # This file is used to define each component of tools_def.txt file\r
 #\r
-# Copyright (c) 2007, Intel Corporation\r
-# All rights reserved. This program and the accompanying materials\r
+# Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\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
@@ -23,7 +23,7 @@ from BuildToolError import *
 from TargetTxtClassObject import *\r
 \r
 ##\r
-# Static vailabes used for pattern\r
+# Static variables used for pattern\r
 #\r
 gMacroRefPattern = re.compile('(DEF\([^\(\)]+\))')\r
 gEnvRefPattern = re.compile('(ENV\([^\(\)]+\))')\r
@@ -180,8 +180,10 @@ class ToolDefClassObject(object):
         EnvReference = gEnvRefPattern.findall(Value)\r
         for Ref in EnvReference:\r
             if Ref not in self.MacroDictionary:\r
-                return False, Ref\r
-            Value = Value.replace(Ref, self.MacroDictionary[Ref])\r
+                Value = Value.replace(Ref, "")\r
+            else:\r
+                Value = Value.replace(Ref, self.MacroDictionary[Ref])\r
+ \r
 \r
         MacroReference = gMacroRefPattern.findall(Value)\r
         for Ref in MacroReference:\r