Merge branch 'tmp' into master3

dragonpilot-community · Jul 10, 2024 · 63e32c0 · 63e32c0
2 parents e6fb3ef + de39b14
commit 63e32c0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/can/SConscript b/can/SConscript
@@ -1,4 +1,4 @@
-Import('env', 'envCython', 'cereal', 'common')
+Import('env', 'envCython', 'cereal', 'common', 'arch')
 
 import os
 
@@ -9,7 +9,10 @@ src = ["dbc.cc", "parser.cc", "packer.cc", "common.cc"]
 libs = [common, "capnp", "kj", "zmq"]
 
 # shared library for openpilot
-libdbc = envDBC.SharedLibrary('libdbc', src, LIBS=libs)
+LINKFLAGS = envDBC["LINKFLAGS"]
+if arch == "Darwin":
+  LINKFLAGS += ["-Wl,-install_name,@loader_path/libdbc.dylib"]
+libdbc = envDBC.SharedLibrary('libdbc', src, LIBS=libs, LINKFLAGS=LINKFLAGS)
 
 # static library for tools like cabana
 envDBC.Library('libdbc_static', src, LIBS=libs)
@@ -25,4 +28,4 @@ lenv.Depends(packer, libdbc)
 
 opendbc_python = Alias("opendbc_python", [parser, packer])
 
-Export('opendbc_python')
+Export('opendbc_python')