build on mac AND linux, also gotta not use these python files

commaai · Dec 15, 2019 · 6e6779f · 6e6779f
1 parent 79dbfc1
commit 6e6779f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/can/packer_pyx_setup.py b/can/packer_pyx_setup.py
@@ -39,6 +39,10 @@ def get_ext_filename(self, ext_name):
 if ARCH == "aarch64":
   extra_compile_args += ["-Wno-deprecated-register"]
 
+if platform.system() == "Darwin":
+  libdbc = "libdbc.dylib"
+else:
+  libdbc = "libdbc.so"
 
 setup(name='CAN packer',
       cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
@@ -52,8 +56,9 @@ def get_ext_filename(self, ext_name):
             BASEDIR,
             os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
           ],
-          libraries=["dbc"],
-          library_dirs=["."],
+          extra_link_args=[
+            os.path.join(BASEDIR, 'opendbc', 'can', libdbc),
+          ],
         )
       ),
       nthreads=4,

diff --git a/can/parser_pyx_setup.py b/can/parser_pyx_setup.py
@@ -39,6 +39,11 @@ def get_ext_filename(self, ext_name):
 if ARCH == "aarch64":
   extra_compile_args += ["-Wno-deprecated-register"]
 
+if platform.system() == "Darwin":
+  libdbc = "libdbc.dylib"
+else:
+  libdbc = "libdbc.so"
+
 setup(name='CAN parser',
       cmdclass={'build_ext': BuildExtWithoutPlatformSuffix},
       ext_modules=cythonize(
@@ -51,8 +56,9 @@ def get_ext_filename(self, ext_name):
             BASEDIR,
             os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'),
           ],
-          libraries=["dbc"],
-          library_dirs=["."],
+          extra_link_args=[
+            os.path.join(BASEDIR, 'opendbc', 'can', libdbc),
+          ],
         )
       ),
       nthreads=4,