[PATCH] testbot/build: Update the source before the native build!
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 96cf74140..c0a9a059c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -138,16 +138,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); - } - - if ($NeedBuildNative) - { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); - } + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); } if ($NeedMakeMakefiles) @@ -159,7 +150,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); } } @@ -173,7 +164,7 @@ sub ApplyPatch($$$) { LogMsg "Autoconf failed\n"; return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure); + $NeedConfigure, $NeedBuildNative); } $NeedConfigure = 1; } @@ -193,7 +184,7 @@ sub ApplyPatch($$$) } return ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure); + $NeedConfigure, $NeedBuildNative); } my $ncpus; @@ -418,7 +409,7 @@ else } my ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure) = ApplyPatch($PatchFile, $PatchType, $BaseName); + $NeedConfigure, $NeedBuildNative) = ApplyPatch($PatchFile, $PatchType, $BaseName); if ($NeedMakefile < 0) { exit(1); @@ -426,6 +417,15 @@ if ($NeedMakefile < 0) CountCPUs(); +if ($NeedBuildNative) +{ + InfoMsg "Building tools\n"; + if (!BuildNative()) + { + exit(1); + } +} + if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, $NeedConfigure, 0 < $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, -- 2.17.0
participants (1)
-
Francois Gouget