From 3d4821c2066e9ec28e79b5897019657551a4fb6c Mon Sep 17 00:00:00 2001 From: Armandpl Date: Tue, 1 Jul 2025 19:34:27 -0700 Subject: [PATCH] include gen path, dont include abs path --- selfdrive/controls/lib/lateral_mpc_lib/SConscript | 3 ++- selfdrive/controls/lib/longitudinal_mpc_lib/SConscript | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/selfdrive/controls/lib/lateral_mpc_lib/SConscript b/selfdrive/controls/lib/lateral_mpc_lib/SConscript index 6a18504969..67c7fbecfd 100644 --- a/selfdrive/controls/lib/lateral_mpc_lib/SConscript +++ b/selfdrive/controls/lib/lateral_mpc_lib/SConscript @@ -78,7 +78,8 @@ libacados_ocp_solver_pxd = File(f'{gen}/acados_solver.pxd') libacados_ocp_solver_c = File(f'{gen}/acados_ocp_solver_pyx.c') lenv2 = envCython.Clone() -lenv2["LINKFLAGS"] += ['-Wl,-rpath,$$ORIGIN', lib_solver[0].get_labspath()] +lenv2["LINKFLAGS"] += ['-Wl,-rpath,\$$ORIGIN'] +lenv2["LINKFLAGS"] += [f'-Wl,-rpath,\$$ORIGIN/{gen}'] lenv2.Command(libacados_ocp_solver_c, [acados_ocp_solver_pyx, acados_ocp_solver_common, libacados_ocp_solver_pxd], f'cython' + \ diff --git a/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript b/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript index 20872d45c7..1cd03e369e 100644 --- a/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript +++ b/selfdrive/controls/lib/longitudinal_mpc_lib/SConscript @@ -86,7 +86,8 @@ libacados_ocp_solver_pxd = File(f'{gen}/acados_solver.pxd') libacados_ocp_solver_c = File(f'{gen}/acados_ocp_solver_pyx.c') lenv2 = envCython.Clone() -lenv2["LINKFLAGS"] += ['-Wl,-rpath,$$ORIGIN', lib_solver[0].get_labspath()] +lenv2["LINKFLAGS"] += ['-Wl,-rpath,\$$ORIGIN'] +lenv2["LINKFLAGS"] += [f'-Wl,-rpath,\$$ORIGIN/{gen}'] lenv2.Command(libacados_ocp_solver_c, [acados_ocp_solver_pyx, acados_ocp_solver_common, libacados_ocp_solver_pxd], f'cython' + \