From dbdfe0861b17554113df81bda755f30fd589e6fd Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Sat, 6 Nov 2021 13:25:32 -0700 Subject: [PATCH] Partially revert #42919 (#42969) * Partially revert #42919 The change to RPATH setting for macOS seems to have improved the situation for users on Monterey, but the other changes in #42919 that affect other platforms seem to have caused regressions on musl Linux (#42940) and FreeBSD (#42944). The easiest thing to do here is to keep the changes from #42919 as they apply to macOS but revert the others. * Un-revert the `RPATH_LIB` definition --- Make.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.inc b/Make.inc index af361dc143d50..7c2f5f0662aba 100644 --- a/Make.inc +++ b/Make.inc @@ -1198,7 +1198,7 @@ else ifeq ($(OS), Darwin) RPATH_ESCAPED_ORIGIN := $(RPATH_ORIGIN) RPATH_LIB := -Wl,-rpath,'@loader_path/' else - RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin + RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin RPATH_ORIGIN := -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin RPATH_ESCAPED_ORIGIN := -Wl,-rpath,'\$$\$$ORIGIN' -Wl,-z,origin -Wl,-rpath-link,$(build_shlibdir) RPATH_LIB := -Wl,-rpath,'$$ORIGIN/' -Wl,-z,origin