From 98f6a336fc22aa9b029b199b8330bbda8ae3498b Mon Sep 17 00:00:00 2001 From: gsell Date: Mon, 6 Feb 2023 09:05:43 +0000 Subject: [PATCH] Merge branch '186-prefix-lib64-is-missing-in-ld_library_path' into 'master' Resolve "$PREFIX/lib64 is missing in LD_LIBRARY_PATH" Closes #186 See merge request Pmodules/src!159 (cherry picked from commit 52cfb4e744cfe4196ab74a79a5646bd25383cd7f) ec50e224 bugfix in setting LD_LIBRARY_PATH --- Pmodules/libmodules.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pmodules/libmodules.tcl b/Pmodules/libmodules.tcl index 9df09e6..4abdabf 100644 --- a/Pmodules/libmodules.tcl +++ b/Pmodules/libmodules.tcl @@ -150,7 +150,6 @@ proc _pmodules_setenv { PREFIX name version } { set setenv_dirs [dict create \ "${PREFIX}/include" "${NAME}_INCLUDE_DIR" \ "${PREFIX}/lib" "${NAME}_LIBRARY_DIR" \ - "${PREFIX}/lib64" "${NAME}_LIBRARY_DIR" \ ] set prepend_dirs [dict create \ "${PREFIX}/bin" { "PATH" } \ @@ -158,6 +157,7 @@ proc _pmodules_setenv { PREFIX name version } { "${PREFIX}/share/man" { "MANPATH" } \ "${PREFIX}/include" { "C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" } \ "${PREFIX}/lib" { "LIBRARY_PATH" "LD_LIBRARY_PATH"} \ + "${PREFIX}/lib64" { "LIBRARY_PATH" "LD_LIBRARY_PATH"} \ "${PREFIX}/lib/pkgconfig" { "PKG_CONFIG_PATH" } \ "${PREFIX}/share/pkgconfig" { "PKG_CONFIG_PATH" } \ "${PREFIX}/lib/cmake" { "CMAKE_MODULE_PATH" } \