diff --git a/SConstruct b/SConstruct
index 320590b058..45b6fd8fdf 100644
--- a/SConstruct
+++ b/SConstruct
@@ -405,13 +405,17 @@ SConscript(['rednose/SConscript'])
 
 # Build system services
 SConscript([
-  'system/camerad/SConscript',
   'system/clocksd/SConscript',
   'system/proclogd/SConscript',
   'system/ubloxd/SConscript',
+  'system/loggerd/SConscript',
 ])
 if arch != "Darwin":
-  SConscript(['system/logcatd/SConscript'])
+  SConscript([
+    'system/camerad/SConscript',
+    'system/sensord/SConscript',
+    'system/logcatd/SConscript',
+  ])
 
 # Build openpilot
 
@@ -428,19 +432,13 @@ SConscript(['third_party/SConscript'])
 SConscript(['common/kalman/SConscript'])
 SConscript(['common/transformations/SConscript'])
 
-SConscript(['selfdrive/modeld/SConscript'])
-
+SConscript(['selfdrive/boardd/SConscript'])
 SConscript(['selfdrive/controls/lib/lateral_mpc_lib/SConscript'])
 SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript'])
-
-SConscript(['selfdrive/boardd/SConscript'])
-
-SConscript(['system/loggerd/SConscript'])
-
 SConscript(['selfdrive/locationd/SConscript'])
-SConscript(['system/sensord/SConscript'])
-SConscript(['selfdrive/ui/SConscript'])
 SConscript(['selfdrive/navd/SConscript'])
+SConscript(['selfdrive/modeld/SConscript'])
+SConscript(['selfdrive/ui/SConscript'])
 
 if (arch in ['x86_64', 'Darwin'] and Dir('#tools/cabana/').exists()) or GetOption('extras'):
   SConscript(['tools/replay/SConscript'])
diff --git a/panda b/panda
index da7c577486..822a7367c1 160000
--- a/panda
+++ b/panda
@@ -1 +1 @@
-Subproject commit da7c57748648e786c99621271b5a88d11bcd90fa
+Subproject commit 822a7367c1912d8b19263bfbda15bf29b188d67d
diff --git a/tools/mac_setup.sh b/tools/mac_setup.sh
index 67ca098c00..6e6538c5c5 100755
--- a/tools/mac_setup.sh
+++ b/tools/mac_setup.sh
@@ -52,6 +52,7 @@ brew "zeromq"
 brew "protobuf"
 brew "protobuf-c"
 brew "swig"
+brew "gcc@12"
 cask "gcc-arm-embedded"
 EOS