Pushed as 787154b -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Nate DeSimone Sent: Monday, September 25, 2023 5:47 PM To: devel@edk2.groups.io Cc: Chiu, Chasel <chasel.c...@intel.com>; Isaac Oram <isaac.w.o...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn>; Dong, Eric <eric.d...@intel.com> Subject: [edk2-devel] [PATCH v1] MinPlatformPkg: If BaseTools doesn't build, try a clean build
Cc: Chasel Chiu <chasel.c...@intel.com> Cc: Isaac Oram <isaac.w.o...@intel.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Cc: Eric Dong <eric.d...@intel.com> Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com> --- Platform/Intel/build_bios.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 9c95cfff76..b396017c8c 100755 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -207,7 +207,22 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): _, _, result, return_code = execute_script(command, config, shell=shell) if return_code != 0: - build_failed(config) + # + # If the BaseTools build fails, then run a clean build and retry + # + clean_command = ["nmake", "-f", + os.path.join(config["BASE_TOOLS_PATH"], "Makefile"), + "clean"] + if os.name == "posix": + clean_command = ["make", "-C", + os.path.join(config["BASE_TOOLS_PATH"]), "clean"] + _, _, result, return_code = execute_script(clean_command, config, + shell=shell) + if return_code != 0: + build_failed(config) + _, _, result, return_code = execute_script(command, config, shell=shell) + if return_code != 0: + build_failed(config) # # build platform silicon tools -- 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111421): https://edk2.groups.io/g/devel/message/111421 Mute This Topic: https://groups.io/mt/101587227/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-