From e9f917836bd004fb1e343851b7c4e88ad64521b1 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 31 May 2025 10:26:03 -0700 Subject: [PATCH] cereal: fixup build deps --- cereal/SConscript | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cereal/SConscript b/cereal/SConscript index a58a9490ce..9fccfc6075 100644 --- a/cereal/SConscript +++ b/cereal/SConscript @@ -1,19 +1,20 @@ -Import('env', 'common', 'msgq') +Import('env', 'msgq') cereal_dir = Dir('.') gen_dir = Dir('gen') # Build cereal schema_files = ['log.capnp', 'car.capnp', 'legacy.capnp', 'custom.capnp'] -env.Command([f'gen/cpp/{s}.c++' for s in schema_files] + [f'gen/cpp/{s}.h' for s in schema_files], +schema_cpp = [f'gen/cpp/{s}.c++' for s in schema_files] + [f'gen/cpp/{s}.h' for s in schema_files] +env.Command(schema_cpp, schema_files, f"capnpc --src-prefix={cereal_dir.path} $SOURCES -o c++:{gen_dir.path}/cpp/") -cereal = env.Library('cereal', [f'gen/cpp/{s}.c++' for s in schema_files]) +cereal = env.Library('cereal', schema_cpp) # Build messaging services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET') -env.Program('messaging/bridge', ['messaging/bridge.cc', 'messaging/msgq_to_zmq.cc'], LIBS=[msgq, common, 'pthread']) +env.Program('messaging/bridge', ['messaging/bridge.cc', 'messaging/msgq_to_zmq.cc'], LIBS=[msgq, 'zmq', 'pthread']) socketmaster = env.Library('socketmaster', ['messaging/socketmaster.cc'])