Clarify to users that they should review the build log when make
(POSIX-like system) or nmake (Windows) fails to compile basetools.
Cc: Rebecca Cran <rebe...@bsdio.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Bob Feng <bob.c.f...@intel.com>
Cc: Yuwei Chen <yuwei.c...@intel.com>
Signed-off-by: Joey Vagedes <joeyvage...@gmail.com>
---
BaseTools/Source/C/Common/BinderFuncs.c | 2 +-
BaseTools/Edk2ToolsBuild.py | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/C/Common/BinderFuncs.c
b/BaseTools/Source/C/Common/BinderFuncs.c
index de835287e95c..8c08bef7a0f0 100644
--- a/BaseTools/Source/C/Common/BinderFuncs.c
+++ b/BaseTools/Source/C/Common/BinderFuncs.c
@@ -21,7 +21,7 @@ CommonLibBinderAllocate (
)
{
return (VOID *) malloc (Size);
-}
+}asdf
VOID
CommonLibBinderFree (
diff --git a/BaseTools/Edk2ToolsBuild.py b/BaseTools/Edk2ToolsBuild.py
index 425bb1b63963..4776c583080f 100644
--- a/BaseTools/Edk2ToolsBuild.py
+++ b/BaseTools/Edk2ToolsBuild.py
@@ -141,7 +141,9 @@ class Edk2ToolsBuild(BaseAbstractInvocable):
for level, problem in problems:
logging.log(level, problem)
if ret != 0:
- raise Exception("Failed to build.")
+ e = "Failed to run nmake.exe. Review Buildlog at
BaseTools/BaseToolsBuild/BASETOOLS_BUILD.txt for nmake.exe error."
+ logging.error(e)
+ return ret
self.WritePathEnvFile(self.OutputDir)
return ret
@@ -156,7 +158,9 @@ class Edk2ToolsBuild(BaseAbstractInvocable):
for level, problem in problems:
logging.log(level, problem)
if ret != 0:
- raise Exception("Failed to build.")
+ e = "Failed to run make. Review Buildlog at
BaseTools/BaseToolsBuild/BASETOOLS_BUILD.txt for make error."
+ logging.error(e)
+ return ret
self.OutputDir = os.path.join(
shell_env.get_shell_var("EDK_TOOLS_PATH"), "Source", "C",
"bin")
--
2.34.1
