SF.net SVN: edk2-buildtools:[2111] trunk/BaseTools/Source/Python/AutoGen/ AutoGen.py

[<yi...@us...>]

Revision: 2111
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2111&view=rev
Author:   yingke
Date:     2010-12-24 01:23:55 +0000 (Fri, 24 Dec 2010)

Log Message:
-----------
Do not link NULL library instances listed in global sections with modules that are USER_DEFINED; NULL libs for standard module types now are linked against library instances defined for that module type, not all module types.

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/AutoGen/AutoGen.py

Modified: trunk/BaseTools/Source/Python/AutoGen/AutoGen.py
===================================================================
--- trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2010-12-23 08:39:03 UTC (rev 2110)
+++ trunk/BaseTools/Source/Python/AutoGen/AutoGen.py	2010-12-24 01:23:55 UTC (rev 2111)
@@ -1077,9 +1077,14 @@
         PlatformModule = self.Platform.Modules[str(Module)]
 
         # add forced library instances (specified under LibraryClasses sections)
-        for LibraryClass in self.Platform.LibraryClasses.GetKeys():
-            if LibraryClass.startswith("NULL"):
-                Module.LibraryClasses[LibraryClass] = self.Platform.LibraryClasses[LibraryClass]
+        #
+        # If a module has a MODULE_TYPE of USER_DEFINED,
+        # do not link in NULL library class instances from the global [LibraryClasses.*] sections.
+        #
+        if Module.ModuleType != SUP_MODULE_USER_DEFINED:
+            for LibraryClass in self.Platform.LibraryClasses.GetKeys():
+                if LibraryClass.startswith("NULL") and self.Platform.LibraryClasses[LibraryClass, Module.ModuleType]:
+                    Module.LibraryClasses[LibraryClass] = self.Platform.LibraryClasses[LibraryClass, Module.ModuleType]
 
         # add forced library instances (specified in module overrides)
         for LibraryClass in PlatformModule.LibraryClasses:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.