wscript: remove 32-bit host environment

It's 2025 now -- there is no need to distribute binaries for 32-bit hosts
anymore, and it's come to the point where some machines (like my laptop!)
cannot seem to successfully compile a `-m32` binary anymore.  And for that
matter, modern macOS cannot even *run* 32-bit Intel binaries.

Extirpate the '32bit' build environment, and replace all uses with 'local'
(and, while we are at it, fix the build for pdc2png).

Signed-off-by: Joshua Wise <[email protected]>

Author: jwise

src/idl/nanopb/wscript

@@ -7,6 +7,6 @@ def build(bld):
               source=bld.path.ant_glob('**/*.proto'),
               includes=bld.path.abspath(),
               target='proto_schemas',
-              use='pblibc nanopb idl_includes')
+              use=['pblibc', 'nanopb', 'idl_includes'])
 
 # vim:filetype=python

src/libbtutil/wscript

@@ -18,7 +18,6 @@ def build(bld):
         build_libutil('libbtutil-cm0', bld.all_envs['cortex-m0'])
 
     build_libutil('libbtutil', bld.env)
-    build_libutil('libbtutil-32bit', bld.all_envs['32bit'])
 
 
 # vim:filetype=python

src/libos/wscript

@@ -15,7 +15,7 @@ def build(bld):
 
     bld(export_includes=['include'], name='libos_includes')
 
-    if bld.env in (bld.all_envs['local'], bld.all_envs['32bit']):
+    if bld.env in (bld.all_envs['local'], ):
         # Skip building sources for local builds, like unit tests.
         return
 

src/libutil/wscript

@@ -18,7 +18,7 @@ def build(bld):
         build_libutil('libutil-cm0', bld.all_envs['cortex-m0'])
 
     build_libutil('libutil', bld.env)
-    build_libutil('libutil-32bit', bld.all_envs['32bit'])
+    build_libutil('libutil-local', bld.all_envs['local'])
 
 
 # vim:filetype=python

tools/pdc2png/wscript

@@ -3,7 +3,7 @@ import sh
 from waflib import Logs
 
 def build(bld):
-    pdc2png_env = bld.all_envs['32bit'].derive()
+    pdc2png_env = bld.all_envs['local'].derive()
     output = bld.path.get_bld().parent.parent.make_node('pdc2png')
 
     sources = ["../../src/fw/applib/vendor/uPNG/upng.c",
@@ -40,6 +40,7 @@ def build(bld):
                 "../../src/fw",
                 "../../src/libutil/includes",
                 "../../src/fw/util/time",
+                "../../applib-targets/overrides",
                 "../../third_party/freertos",
                 "../../third_party/freertos/FreeRTOS-Kernel/FreeRTOS/Source/include",
                 "../../third_party/freertos/FreeRTOS-Kernel/FreeRTOS/Source/portable/GCC/ARM_CM3"]
@@ -66,7 +67,7 @@ def build(bld):
                          'DISPLAY_FRAMEBUFFER_BYTES=%d' % (144 * 168),
                          'PBL_COLOR', 'PBL_RECT', 'PLATFORM_SNOWY=1',
                          'PBI2PNG_EXE="../../tools/pbi2png.py"'],
-                use=['libutil-32bit', 'libos_includes'],
+                use=['libutil-local', 'libos_includes'],
                 env=pdc2png_env)
 
 

tools/qemu_spi_cooker/wscript

@@ -4,7 +4,7 @@ from waflib import Logs
 
 
 def build(bld):
-    qemu_spi_cooker_env = bld.all_envs['32bit'].derive()
+    qemu_spi_cooker_env = bld.all_envs['local'].derive()
     output = bld.path.get_bld().parent.parent.make_node('qemu_spi_cooker')
 
     sources = ["../../src/fw/services/normal/filesystem/flash_translation.c",

wscript

@@ -579,16 +579,6 @@ def configure(conf):
             source = conf.path.get_bld().make_node(filename)
             os.symlink(source.path_from(conf.path), filename)
 
-    prev_env = conf.env
-    Logs.pprint('CYAN', 'Configuring 32 bit host environment')
-    # Copy 'local' to serve as the basis for '32bit':
-    env_32bit = conf.env.derive().detach()
-    env_32bit.append_value('CFLAGS', '-m32')
-    env_32bit.append_value('LINKFLAGS', '-m32')
-    env_32bit.LINK_CC = 'gcc'
-    conf.all_envs['32bit'] = env_32bit
-    conf.set_env(prev_env)
-
     # Note: this will modify the 'local' conf when targeting emscripten:
     conf.recurse('applib-targets')
 
@@ -688,6 +678,7 @@ def build(bld):
 
     if bld.variant == 'pdc2png':
         bld.recurse('src/libutil')
+        bld.recurse('third_party/nanopb')
         bld.recurse('tools')
         return