]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Fix incremental build genmake issue
authorFeng, Bob C <bob.c.feng@intel.com>
Wed, 21 Aug 2019 09:50:54 +0000 (17:50 +0800)
committerFeng, Bob C <bob.c.feng@intel.com>
Fri, 23 Aug 2019 03:26:24 +0000 (11:26 +0800)
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2090

This is a regression issue introduced by commit e8449e.
This patch is going to fix this issue.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/Python/build/build.py

index 2c10670a6910bb73adb7679959ecb4a5d43253be..0406ac314b65b3d27be0d9c74fce4ae31fce90eb 100755 (executable)
@@ -1219,7 +1219,6 @@ class Build():
             for m in AutoGenObject.GetAllModuleInfo:\r
                 mqueue.put(m)\r
 \r
-            AutoGenObject.DataPipe.DataContainer = {"FfsCommand":FfsCommand}\r
             AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}\r
             self.Progress.Start("Generating makefile and code")\r
             data_pipe_file = os.path.join(AutoGenObject.BuildDir, "GlobalVar_%s_%s.bin" % (str(AutoGenObject.Guid),AutoGenObject.Arch))\r
@@ -1738,6 +1737,8 @@ class Build():
                             Ma.Workspace = Wa\r
                             PcdMaList.append(Ma)\r
                         self.BuildModules.append(Ma)\r
+                    Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}\r
+                    Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}\r
                     self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict,PcdMaList=PcdMaList)\r
 \r
                 # Create MAP file when Load Fix Address is enabled.\r