Remove arch loops from build scripts. (#889)

This simplifies non-sdk build scripts by removing their loops over SM.archs. Instead the top-level
build script will re-evaluate them for each architecture.

AMBuildScript

@@ -639,32 +639,40 @@ for arch in SM.archs:
      SP.libsourcepawn[arch]
   ]
 
-BuildScripts = [
+NonSDKBuilds = [
-  'loader/AMBuilder',
-  'core/AMBuilder',
   'core/logic/AMBuilder',
   'extensions/bintools/AMBuilder',
   'extensions/clientprefs/AMBuilder',
   'extensions/curl/AMBuilder',
-  'extensions/cstrike/AMBuilder',
   'extensions/geoip/AMBuilder',
-  'extensions/mysql/AMBuilder',
   'extensions/regex/AMBuilder',
-  'extensions/sdkhooks/AMBuilder',
-  'extensions/sdktools/AMBuilder',
   'extensions/sqlite/AMBuilder',
-  'extensions/tf2/AMBuilder',
   'extensions/topmenus/AMBuilder',
   'extensions/updater/AMBuilder',
+  'loader/AMBuilder',
 ]
+if SM.mysql_root:
+  NonSDKBuilds += [
+    'extensions/mysql/AMBuilder',
+  ]
+for arch in SM.archs:
+  builder.Build(NonSDKBuilds, { 'SM': SM, 'arch': arch })
+
+SDKBuilds = [
+  'core/AMBuilder',
+  'extensions/cstrike/AMBuilder',
+  'extensions/sdkhooks/AMBuilder',
+  'extensions/sdktools/AMBuilder',
+  'extensions/tf2/AMBuilder',
+]
+builder.Build(SDKBuilds, { 'SM': SM })
 
 if builder.backend == 'amb2':
-  BuildScripts += [
+  OtherScripts = [
     'plugins/AMBuilder',
     'tools/buildbot/PackageScript',
   ]
-
+  builder.Build(OtherScripts, { 'SM': SM })
-builder.Build(BuildScripts, { 'SM': SM })
 
 if builder.options.breakpad_dump:
   builder.Build('tools/buildbot/BreakpadSymbols', { 'SM': SM })

core/logic/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.Library(builder, 'sourcemod.logic', arch)
 binary.compiler.cxxincludes += [
   builder.sourcePath,

extensions/bintools/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'bintools.ext', arch)
 binary.compiler.defines += ['HOOKING_ENABLED']
 binary.compiler.cxxincludes += [
@@ -27,4 +26,3 @@ for arch in SM.archs:
   binary.sources += ['jit_call.cpp']
 
 SM.extensions += [builder.Add(binary)]
-

extensions/clientprefs/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'clientprefs.ext', arch)
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -21,4 +20,3 @@ for arch in SM.archs:
 ]
 
 SM.extensions += [builder.Add(binary)]
-

extensions/curl/AMBuilder

@@ -2,7 +2,7 @@
 import os
 
 libcurl = builder.Build('curl-src/lib/AMBuilder')
-for arch in SM.archs:
+
 binary = SM.ExtLibrary(builder, 'webternet.ext', arch)
 binary.compiler.includes += [
   os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
@@ -25,4 +25,3 @@ for arch in SM.archs:
 ]
 
 SM.extensions += [builder.Add(binary)]
-

extensions/geoip/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'geoip.ext', arch)
 if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
   binary.compiler.cxxflags += ['-fno-rtti']
@@ -17,4 +16,3 @@ for arch in SM.archs:
 ]
 
 SM.extensions += [builder.Add(binary)]
-

extensions/mysql/AMBuilder

@@ -1,8 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-if SM.mysql_root:
-  for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'dbi.mysql.ext', arch)
 binary.compiler.cxxincludes += [
   os.path.join(SM.mysql_root[arch], 'include'),
@@ -45,4 +43,3 @@ if SM.mysql_root:
   binary.compiler.defines += ['HAVE_STRUCT_TIMESPEC']
 
 SM.extensions += [builder.Add(binary)]
-

extensions/regex/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'regex.ext', arch)
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -32,4 +31,3 @@ for arch in SM.archs:
 ]
 
 SM.extensions += [builder.Add(binary)]
-

extensions/sqlite/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'dbi.sqlite.ext', arch)
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -31,4 +30,3 @@ for arch in SM.archs:
 ]
 
 SM.extensions += [builder.Add(binary)]
-

extensions/topmenus/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'topmenus.ext', arch)
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),

extensions/updater/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-for arch in SM.archs:
 binary = SM.ExtLibrary(builder, 'updater.ext', arch)
 binary.compiler.cxxincludes += [
   os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -20,4 +19,3 @@ for arch in SM.archs:
 ]
 
 SM.extensions += [builder.Add(binary)]
-

loader/AMBuilder

@@ -1,7 +1,6 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
-for arch in SM.archs:
 if builder.target.platform in ['windows', 'mac']:
   name = 'sourcemod_mm'
   extra_ldflags = []