scons: only enable swaglog for submodules (#33365)

only enable swaglog for submodules
old-commit-hash: 7a6e686ec7
pull/33386/head
Dean Lee 8 months ago committed by GitHub
parent 2bfbc779b3
commit 7dfe2706d6
  1. 16
      SConstruct

@ -168,9 +168,6 @@ else:
if arch != "Darwin": if arch != "Darwin":
ldflags += ["-Wl,--as-needed", "-Wl,--no-undefined"] ldflags += ["-Wl,--as-needed", "-Wl,--no-undefined"]
# Enable swaglog include in submodules
cxxflags += ['-DSWAGLOG="\\"common/swaglog.h\\""']
ccflags_option = GetOption('ccflags') ccflags_option = GetOption('ccflags')
if ccflags_option: if ccflags_option:
ccflags += ccflags_option.split(' ') ccflags += ccflags_option.split(' ')
@ -348,18 +345,21 @@ gpucommon = [_gpucommon]
Export('common', 'gpucommon') Export('common', 'gpucommon')
# Build messaging (cereal + msgq + socketmaster + their dependencies) # Build messaging (cereal + msgq + socketmaster + their dependencies)
SConscript(['msgq_repo/SConscript']) # Enable swaglog include in submodules
env_swaglog = env.Clone()
env_swaglog['CXXFLAGS'].append('-DSWAGLOG="\\"common/swaglog.h\\""')
SConscript(['msgq_repo/SConscript'], exports={'env': env_swaglog})
SConscript(['opendbc/can/SConscript'], exports={'env': env_swaglog})
SConscript(['cereal/SConscript']) SConscript(['cereal/SConscript'])
Import('socketmaster', 'msgq') Import('socketmaster', 'msgq')
messaging = [socketmaster, msgq, 'zmq', 'capnp', 'kj',] messaging = [socketmaster, msgq, 'zmq', 'capnp', 'kj',]
Export('messaging') Export('messaging')
# Build other submodules # Build other submodules
SConscript([ SConscript(['panda/SConscript'])
'opendbc/can/SConscript',
'panda/SConscript',
])
# Build rednose library # Build rednose library
SConscript(['rednose/SConscript']) SConscript(['rednose/SConscript'])

Loading…
Cancel
Save