From f243d9983fdc32cabd28fd43858ea3e8d32983c2 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 2 Sep 2022 23:10:37 +0200 Subject: [PATCH] CMake: Add `--disable-new-dtags` linker option for deploy-stub This forces the use of DT_RPATH instead of DT_RUNPATH, see #1358 and 8617eb917c9009f1a540b4d789e261a50e3a5387 --- pandatool/src/deploy-stub/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandatool/src/deploy-stub/CMakeLists.txt b/pandatool/src/deploy-stub/CMakeLists.txt index 851bc9ac4c..1c7a37017f 100644 --- a/pandatool/src/deploy-stub/CMakeLists.txt +++ b/pandatool/src/deploy-stub/CMakeLists.txt @@ -17,7 +17,7 @@ elseif(IS_LINUX OR IS_FREEBSD) set_target_properties(deploy-stub PROPERTIES INSTALL_RPATH "$ORIGIN" BUILD_WITH_INSTALL_RPATH ON) - target_link_options(deploy-stub PRIVATE -Wl,-z,origin -rdynamic) + target_link_options(deploy-stub PRIVATE -Wl,--disable-new-dtags -Wl,-z,origin -rdynamic) endif() target_link_libraries(deploy-stub Python::Python)