From 1fc9af9d7cd48d423e584d43126d29d979ad5dd4 Mon Sep 17 00:00:00 2001 From: Rens Dofferhoff Date: Wed, 29 Nov 2023 18:52:30 +0100 Subject: [PATCH] Complete the matrixFix --- Engine/otoolstuff.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Engine/otoolstuff.cpp b/Engine/otoolstuff.cpp index d2535f891d..ec8b08f3a0 100644 --- a/Engine/otoolstuff.cpp +++ b/Engine/otoolstuff.cpp @@ -107,11 +107,13 @@ void _moduleLibraryFixer(const std::string & moduleLibraryPath, bool engineCall, // Know prefixes to be replaced const std::map prefixes_map = { - {"/Library/Frameworks/R.framework/Versions/" + AppInfo::getRDirName() + "/Resources/lib", framework_resources + "lib"}, - // {"/opt/R/arm64/lib", framework_resources + "opt/R/arm64/lib"}, - {"/usr/local/lib/libjags", framework_resources + "opt/jags/lib/libjags"}, - {"/usr/local/lib/libjrmath", framework_resources + "opt/jags/lib/libjrmath"}, - {"/usr/local/lib", framework_resources + "opt/local/lib"}, + {"/Library/Frameworks/R.framework/Versions/" + AppInfo::getRDirName() + "/Resources/lib", framework_resources + "lib"}, + // {"/opt/R/arm64/lib", framework_resources + "opt/R/arm64/lib"}, + {"/usr/local/lib/libjags", framework_resources + "opt/jags/lib/libjags"}, + {"/usr/local/lib/libjrmath", framework_resources + "opt/jags/lib/libjrmath"}, + {"/usr/local/lib", framework_resources + "opt/local/lib"}, + {"/opt/gfortran/lib/gcc/x86_64-apple-darwin20.0/12.2.0", framework_resources + "lib"}, + {"/opt/gfortran/lib/gcc/aarch64-apple-darwin20.0/12.2.0", framework_resources + "opt/R/arm64/gfortran/lib"}, }; // Known fix library id's and paths