Revert "Revert "Fix build failures in Ubuntu 21.10 (#22952)""

This reverts commit 5e2570dc75.
2026-02-18 20:03:53 +08:00 · 2021-11-17 13:46:38 -08:00
parent 36ca9d2daa
commit f2a81309e1
3 changed files with 4 additions and 0 deletions
--- a/1
+++ b/1
@@ -189,6 +189,7 @@ env = Environment(
    "-Wno-inconsistent-missing-override",
    "-Wno-c99-designator",
    "-Wno-reorder-init-list",
+    "-Wno-error=unused-but-set-variable",
  ] + cflags + ccflags,

  CPPPATH=cpppath + [
--- a/selfdrive/ui/navd/route_engine.h
+++ b/selfdrive/ui/navd/route_engine.h
@@ -1,5 +1,7 @@
 #pragma once

+#include <optional>
+
 #include <QThread>
 #include <QGeoCoordinate>
 #include <QGeoManeuver>
--- a/selfdrive/ui/ui.h
+++ b/selfdrive/ui/ui.h
@@ -3,6 +3,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <optional>

 #include <QObject>
 #include <QTimer>