Francois Gouget : testbot/build: ARCH_STRING has been renamed to GECKO_ARCH.

Alexandre Julliard julliard at winehq.org
Fri Jan 15 15:38:07 CST 2021


Module: tools
Branch: master
Commit: 6af8a63bf067a4a6d6bed9112efb681de0c49482
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=6af8a63bf067a4a6d6bed9112efb681de0c49482

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Jan 15 16:14:41 2021 +0100

testbot/build: ARCH_STRING has been renamed to GECKO_ARCH.

This matches the MONO_ARCH property.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/lib/Build/Utils.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index aa78618..a56a4f2 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -490,11 +490,7 @@ sub UpdateAddOns()
     my $Arch = "";
     while (my $Line= <$fh>)
     {
-      if ($Line =~ /^\s*#\s*define\s+ARCH_STRING\s+"([^"]+)"/)
-      {
-        $Arch = $1;
-      }
-      elsif ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/)
+      if ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/)
       {
         $Arch = $1;
       }




More information about the wine-cvs mailing list