Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Medrano <jose.medrano@microsoft.com>2021-11-30 17:07:16 +0300
committerGitHub <noreply@github.com>2021-11-30 17:07:16 +0300
commit52d584291e4779d39a1e14a27dd8ba3cf1176360 (patch)
tree9fcccb7a5f30a8acd598d45fb38758991a9e7eba
parente100285775e333c2cc66dca29e990b616c352509 (diff)
Adds full path to libcairo for correct assembly directory resolution in monterey (#21326)
New MacOS Monterey is not correctly resolving dylib locations when dllmap configuration is not specifying full paths, this makes VS4Mac use libcairo-2.dll from a dependency of a installed library in Hombrew. A workaround was set full path to libcairo-2 and this fixed the problem. Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
-rw-r--r--data/config.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/config.in b/data/config.in
index 5758a172e19..2718b6e9f45 100644
--- a/data/config.in
+++ b/data/config.in
@@ -30,7 +30,7 @@
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
<dllmap dll="libasound" target="libasound.so.2" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
- <dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
+ <dllmap dll="libcairo-2.dll" target="$mono_libdir/libcairo.2.dylib" os="osx" />
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
<dllmap dll="i:kernel32.dll">