From 6ab6b643a8284a149328f9914b7b286d12079261 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Fri, 20 Jan 2023 14:11:43 -0800 Subject: [PATCH] set path for extra qt bins on device (#27022) * set path for extra qt bins on device * no print Co-authored-by: Comma Device old-commit-hash: e883976a32a4190123d891f51cc567dfd77e6c85 --- SConstruct | 1 + selfdrive/ui/SConscript | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index 8864164f15..31aa6ecced 100644 --- a/SConstruct +++ b/SConstruct @@ -311,6 +311,7 @@ else: qt_libs = [f"Qt5{m}" for m in qt_modules] if arch == "larch64": qt_libs += ["GLESv2", "wayland-client"] + qt_env.PrependENVPath('PATH', Dir("#third_party/qt5/larch64/bin/").abspath) elif arch != "Darwin": qt_libs += ["GL"] diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 2fb7227f63..0f28f5ccc3 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -74,13 +74,12 @@ translation_sources = [f"#selfdrive/ui/translations/{l}.ts" for l in languages.v translation_targets = [src.replace(".ts", ".qm") for src in translation_sources] lrelease_bin = 'third_party/qt5/larch64/bin/lrelease' if arch == 'larch64' else 'lrelease' +lupdate = qt_env.Command(translation_sources, qt_src, "selfdrive/ui/update_translations.py") lrelease = qt_env.Command(translation_targets, translation_sources, f"{lrelease_bin} $SOURCES") -if arch != 'larch64': - lupdate = qt_env.Command(translation_sources, qt_src, "selfdrive/ui/update_translations.py") - qt_env.Depends(lrelease, lupdate) - qt_env.NoClean(translation_sources) - qt_env.Precious(translation_sources) - qt_env.NoCache(lupdate) +qt_env.Depends(lrelease, lupdate) +qt_env.NoClean(translation_sources) +qt_env.Precious(translation_sources) +qt_env.NoCache(lupdate) # setup and factory resetter if GetOption('extras'):