mawei
/
openpilot0
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scons: remove duplicate linker flags for -ljson11, -lzmq (#33361) 

fix duplicate link
old-commit-hash: 908aa525ec
This commit is contained in:
Dean Lee 2024-08-24 01:42:57 +08:00 committed by GitHub
parent e154f03a12
commit 965aea8eab
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cereal/SConscript
View File

@ -22,7 +22,7 @@ env.SharedLibrary('cereal_shared', cereal_objects)
# Build messaging # Build messaging
services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET') services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET')
env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[msgq, 'zmq', common]) env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[msgq, common])
socketmaster = env.SharedObject(['messaging/socketmaster.cc']) socketmaster = env.SharedObject(['messaging/socketmaster.cc'])

6
selfdrive/modeld/SConscript
View File

@ -4,7 +4,7 @@ Import('env', 'envCython', 'arch', 'cereal', 'messaging', 'common', 'gpucommon',
lenv = env.Clone() lenv = env.Clone()
lenvCython = envCython.Clone() lenvCython = envCython.Clone()
libs = [cereal, messaging, visionipc, gpucommon, common, 'capnp', 'zmq', 'kj', 'pthread'] libs = [cereal, messaging, visionipc, gpucommon, common, 'capnp', 'kj', 'pthread']
frameworks = [] frameworks = []
common_src = [ common_src = [
@ -69,6 +69,6 @@ if arch == "larch64" or GetOption('pc_thneed'):
lenv.Command(fn + ".thneed", [fn + ".onnx"] + tinygrad_files, cmd) lenv.Command(fn + ".thneed", [fn + ".onnx"] + tinygrad_files, cmd)
thneed_lib = env.SharedLibrary('thneed', thneed_src, LIBS=[gpucommon, common, 'zmq', 'OpenCL', 'dl']) thneed_lib = env.SharedLibrary('thneed', thneed_src, LIBS=[gpucommon, common, 'OpenCL', 'dl'])
thneedmodel_lib = env.Library('thneedmodel', ['runners/thneedmodel.cc']) thneedmodel_lib = env.Library('thneedmodel', ['runners/thneedmodel.cc'])
lenvCython.Program('runners/thneedmodel_pyx.so', 'runners/thneedmodel_pyx.pyx', LIBS=envCython["LIBS"]+[thneedmodel_lib, thneed_lib, gpucommon, common, 'dl', 'zmq', 'OpenCL']) lenvCython.Program('runners/thneedmodel_pyx.so', 'runners/thneedmodel_pyx.pyx', LIBS=envCython["LIBS"]+[thneedmodel_lib, thneed_lib, gpucommon, common, 'dl', 'OpenCL'])

4
selfdrive/ui/SConscript
View File

@ -79,7 +79,7 @@ if GetOption('extras') and arch != "Darwin":
# setup and factory resetter # setup and factory resetter
qt_env.Program("qt/setup/reset", ["qt/setup/reset.cc"], LIBS=qt_libs) 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], qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc", asset_obj],
LIBS=qt_libs + ['curl', 'common', 'json11']) LIBS=qt_libs + ['curl', 'common'])
# build updater UI # build updater UI
qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs) qt_env.Program("qt/setup/updater", ["qt/setup/updater.cc", asset_obj], LIBS=qt_libs)
@ -113,4 +113,4 @@ if GetOption('extras') and arch != "Darwin":
# build watch3 # build watch3
if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'): if arch in ['x86_64', 'aarch64', 'Darwin'] or GetOption('extras'):
qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'json11', 'msgq', 'visionipc']) qt_env.Program("watch3", ["watch3.cc"], LIBS=qt_libs + ['common', 'msgq', 'visionipc'])

2
system/logcatd/SConscript
View File

@ -1,3 +1,3 @@
Import('env', 'messaging', 'common') Import('env', 'messaging', 'common')
env.Program('logcatd', 'logcatd_systemd.cc', LIBS=[messaging, common, 'systemd', 'json11']) env.Program('logcatd', 'logcatd_systemd.cc', LIBS=[messaging, common, 'systemd'])

2
system/proclogd/SConscript
View File

@ -1,5 +1,5 @@
Import('env', 'messaging', 'common') Import('env', 'messaging', 'common')
libs = [messaging, 'pthread', 'common', 'zmq', 'json11'] libs = [messaging, 'pthread', common]
env.Program('proclogd', ['main.cc', 'proclog.cc'], LIBS=libs) env.Program('proclogd', ['main.cc', 'proclog.cc'], LIBS=libs)
if GetOption('extras'): if GetOption('extras'):