ui: Allow Qt spinner/text/setup/reset/updater to build on macOS (#34265)

ui: Allow spinner/text/setup/reset/updater to build on macOS

selfdrive/ui/SConscript

@@ -67,14 +67,13 @@ if GetOption('extras'):
   qt_src.remove("main.cc")  # replaced by test_runner
   qt_env.Program('tests/test_translations', [asset_obj, 'tests/test_runner.cc', 'tests/test_translations.cc'] + qt_src, LIBS=qt_libs)
 
-if GetOption('extras') and arch != "Darwin":
+if GetOption('extras'):
   qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs)
 
   # spinner and text window
   qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs)
   qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs)
 
-
   # setup and factory resetter
   qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs)
   qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],
@@ -83,29 +82,30 @@ if GetOption('extras') and arch != "Darwin":
   # build updater UI
   qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs)
 
-  # build installers
+  if arch != "Darwin":
-  senv = qt_env.Clone()
+    # build installers
-  senv['LINKFLAGS'].append('-Wl,-strip-debug')
+    senv = qt_env.Clone()
-
+    senv['LINKFLAGS'].append('-Wl,-strip-debug')
-  release = "release3"
+
-  installers = [
+    release = "release3"
-    ("openpilot", release),
+    installers = [
-    ("openpilot_test", f"{release}-staging"),
+      ("openpilot", release),
-    ("openpilot_nightly", "nightly"),
+      ("openpilot_test", f"{release}-staging"),
-    ("openpilot_internal", "nightly-dev"),
+      ("openpilot_nightly", "nightly"),
-  ]
+      ("openpilot_internal", "nightly-dev"),
-
+    ]
-  cont = senv.Command(f"installer/continue_openpilot.o", f"installer/continue_openpilot.sh",
+
-                      "ld -r -b binary -o $TARGET $SOURCE")
+    cont = senv.Command(f"installer/continue_openpilot.o", f"installer/continue_openpilot.sh",
-  for name, branch in installers:
+                        "ld -r -b binary -o $TARGET $SOURCE")
-    d = {'BRANCH': f"'\"{branch}\"'"}
+    for name, branch in installers:
-    if "internal" in name:
+      d = {'BRANCH': f"'\"{branch}\"'"}
-      d['INTERNAL'] = "1"
+      if "internal" in name:
-
+        d['INTERNAL'] = "1"
-    obj = senv.Object(f"installer/installers/installer_{name}.o", ["installer/installer.cc"], CPPDEFINES=d)
+
-    f = senv.Program(f"installer/installers/installer_{name}", [obj, cont], LIBS=qt_libs)
+      obj = senv.Object(f"installer/installers/installer_{name}.o", ["installer/installer.cc"], CPPDEFINES=d)
-    # keep installers small
+      f = senv.Program(f"installer/installers/installer_{name}", [obj, cont], LIBS=qt_libs)
-    assert f[0].get_size() < 370*1e3
+      # keep installers small
+      assert f[0].get_size() < 370*1e3
 
 # build watch3
 if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):