diff options
author | Yingke Liu <yingke.d.liu@intel.com> | 2015-01-19 05:01:39 +0000 |
---|---|---|
committer | yingke <yingke@Edk2> | 2015-01-19 05:01:39 +0000 |
commit | b0e23cf32bc5f13c77e80b1e63faa14511c118c1 (patch) | |
tree | aafd0e9d281631a2fe11073d70a0d68a4f8a3bb3 /BaseTools | |
parent | 4e4a6f3d23c8a96211c0b1420bce4c136ede07fd (diff) | |
download | edk2-platforms-b0e23cf32bc5f13c77e80b1e63faa14511c118c1.tar.xz |
Fixed build issue with fds target specified.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Hesheng Chen <hesheng.chen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16619 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools')
-rw-r--r-- | BaseTools/Source/Python/build/build.py | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 40d4055bfc..9b48ac094b 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2,7 +2,7 @@ # build a platform or a module
#
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P.<BR>
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -932,11 +932,6 @@ class Build(): makefile = GenMake.BuildFile(AutoGenObject)._FILE_NAME_[GenMake.gMakeType]
- # genfds
- if Target == 'fds':
- LaunchCommand(AutoGenObject.GenFdsCommand, AutoGenObject.MakeFileDir)
- return True
-
# run
if Target == 'run':
RunDir = os.path.normpath(os.path.join(AutoGenObject.BuildDir, GlobalData.gGlobalDefines['ARCH']))
@@ -1055,6 +1050,14 @@ class Build(): (AutoGenObject.BuildTarget, AutoGenObject.ToolChain, AutoGenObject.Arch),
ExtraData=str(AutoGenObject))
+ # build modules
+ if BuildModule:
+ if Target != 'fds':
+ BuildCommand = BuildCommand + [Target]
+ LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
+ self.CreateAsBuiltInf()
+ return True
+
# genfds
if Target == 'fds':
LaunchCommand(AutoGenObject.GenFdsCommand, AutoGenObject.MakeFileDir)
@@ -1068,13 +1071,6 @@ class Build(): LaunchCommand(Command, RunDir)
return True
- # build modules
- BuildCommand = BuildCommand + [Target]
- if BuildModule:
- LaunchCommand(BuildCommand, AutoGenObject.MakeFileDir)
- self.CreateAsBuiltInf()
- return True
-
# build library
if Target == 'libraries':
pass
@@ -1454,13 +1450,12 @@ class Build(): # Rebase module to the preferred memory address before GenFds
#
self._CollectModuleMapBuffer(MapBuffer, ModuleList)
- if self.Fdf:
- #
- # create FDS again for the updated EFI image
- #
- self._Build("fds", Wa)
if self.Fdf:
#
+ # create FDS again for the updated EFI image
+ #
+ self._Build("fds", Wa)
+ #
# Create MAP file for all platform FVs after GenFds.
#
self._CollectFvMapBuffer(MapBuffer, Wa, ModuleList)
@@ -1549,10 +1544,10 @@ class Build(): # Rebase module to the preferred memory address before GenFds
#
self._CollectModuleMapBuffer(MapBuffer, ModuleList)
- #
- # create FDS again for the updated EFI image
- #
- self._Build("fds", Wa)
+ #
+ # create FDS again for the updated EFI image
+ #
+ self._Build("fds", Wa)
#
# Create MAP file for all platform FVs after GenFds.
#
|