build on macos

pull/35624/head
Armandpl 6 days ago
parent 19e60892bb
commit d1c38e046c
  1. 6
      selfdrive/controls/lib/lateral_mpc_lib/SConscript
  2. 4
      selfdrive/controls/lib/longitudinal_mpc_lib/SConscript

@ -55,7 +55,8 @@ source_list = ['lat_mpc.py',
] ]
lenv = env.Clone() lenv = env.Clone()
lenv["RPATH"] += [lenv.Literal(f'\\$$ORIGIN/{Dir({gen}).rel_path(Dir(f"#third_party/acados/{arch}/lib"))}')] acados_rel_path = Dir({gen}).rel_path(Dir(f"#third_party/acados/{arch}/lib"))
lenv["RPATH"] += [lenv.Literal(f'\\$$ORIGIN/{acados_rel_path}')]
lenv.Clean(generated_files, Dir(gen)) lenv.Clean(generated_files, Dir(gen))
generated_lat = lenv.Command(generated_files, generated_lat = lenv.Command(generated_files,
@ -68,6 +69,9 @@ lenv["CXXFLAGS"].append("-DACADOS_WITH_QPOASES")
lenv["CCFLAGS"].append("-Wno-unused") lenv["CCFLAGS"].append("-Wno-unused")
if arch != "Darwin": if arch != "Darwin":
lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags") lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags")
else:
lenv["LINKFLAGS"].append("-Wl,-install_name,@loader_path/libacados_ocp_solver_lat.dylib")
lenv["LINKFLAGS"].append(f"-Wl,-rpath,@loader_path/{acados_rel_path}")
lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_lat", lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_lat",
build_files, build_files,
LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e']) LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e'])

@ -61,7 +61,8 @@ source_list = ['long_mpc.py',
] ]
lenv = env.Clone() lenv = env.Clone()
lenv["RPATH"] += [lenv.Literal(f'\\$$ORIGIN/{Dir({gen}).rel_path(Dir(f"#third_party/acados/{arch}/lib"))}')] acados_rel_path = Dir({gen}).rel_path(Dir(f"#third_party/acados/{arch}/lib"))
lenv["RPATH"] += [lenv.Literal(f'\\$$ORIGIN/{acados_rel_path}')]
lenv.Clean(generated_files, Dir(gen)) lenv.Clean(generated_files, Dir(gen))
generated_long = lenv.Command(generated_files, generated_long = lenv.Command(generated_files,
source_list, source_list,
@ -75,6 +76,7 @@ if arch != "Darwin":
lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags") lenv["LINKFLAGS"].append("-Wl,--disable-new-dtags")
else: else:
lenv["LINKFLAGS"].append("-Wl,-install_name,@loader_path/libacados_ocp_solver_long.dylib") lenv["LINKFLAGS"].append("-Wl,-install_name,@loader_path/libacados_ocp_solver_long.dylib")
lenv["LINKFLAGS"].append(f"-Wl,-rpath,@loader_path/{acados_rel_path}")
lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_long", lib_solver = lenv.SharedLibrary(f"{gen}/acados_ocp_solver_long",
build_files, build_files,
LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e']) LIBS=['m', 'acados', 'hpipm', 'blasfeo', 'qpOASES_e'])

Loading…
Cancel
Save