Skip to content

Commit 863ceca

Browse files
committed
Add config file for libmono-native dllmap
The sn tool is used during the build to sign assemblies, but with a twist: It uses the MONO_CFG_DIR environment variable to force a custom machine.config from the 4.5/mono/machine.config directory with custom key mappings. That in turn also changes where the global dllmap file is looked up though and now that certain core parts of the BCL rely on System.Native we need to make sure we have it in place.
1 parent 53146a3 commit 863ceca

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

fsharp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ $(FSHARP_DIRECTORIES):
184184
### Sign the assemblies. This is done in a temporary directory so that we don't have to re-sign on every install.
185185
build/%.dll: $(BIN_DIR)/%.dll | build/monotouch build/xamarinmacmobile build/xamarinmacfull build/xamarinwatchos build/xamarintvos
186186
$(Q) $(CP) $< $@
187-
$(Q_SN) MONO_CFG_DIR="$(TOP)" sn -q -R "$@" "$(PRODUCT_KEY_PATH)"
187+
$(Q_SN) MONO_CFG_DIR="$(TOP)" $(SYSTEM_SN) -q -R "$@" "$(PRODUCT_KEY_PATH)"
188188

189189
build.stamp: export TargetFrameworkFallbackSearchPaths=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks
190190
build.stamp: export MSBuildExtensionsPathFallbackPathsOverride=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild

mono/config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<configuration>
2+
<dllmap dll="System.Native" target="$mono_libdir/libmono-native-compat.dylib" os="!windows" />
3+
</configuration>

0 commit comments

Comments
 (0)