From 0a47a8ce0c6d00e7d36e3315289c99de01f417b2 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 11 Apr 2017 15:01:57 +0200 Subject: [PATCH] Patch from Zoltan to fix build error with CppSharp.CppParser.dll (#1967) (#1986) --- Make.config | 1 + builds/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Make.config b/Make.config index bc9f8db11f..61bb28c54b 100644 --- a/Make.config +++ b/Make.config @@ -234,6 +234,7 @@ MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current SYSTEM_MCS=$(MONO_PREFIX)/bin/mcs SYSTEM_SN=$(MONO_PREFIX)/bin/sn SYSTEM_MONO=$(MONO_PREFIX)/bin/mono +SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32 SYSTEM_MKBUNDLE=$(MONO_PREFIX)/bin/mkbundle SYSTEM_XBUILD=$(MONO_PREFIX)/bin/xbuild SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen diff --git a/builds/Makefile b/builds/Makefile index 1f7fc56bf3..6ab631068a 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -1906,7 +1906,7 @@ targetwatch/mono/arch/arm/arm_dpimacros.h: .stamp-configure-targetwatch define GenerateCrossOffsets $(3)/$(1).h: .stamp-configure-$(3) target7/mono/arch/arm/arm_dpimacros.h targetwatch/mono/arch/arm/arm_dpimacros.h $(4)/tools/offsets-tool/MonoAotOffsetsDumper.exe $(Q) MONO_PATH=$(4)/tools/offsets-tool/CppSharp/osx_32 \ - $(SYSTEM_MONO) $(4)/tools/offsets-tool/MonoAotOffsetsDumper.exe --abi $(1) --out $(2) --mono $(abspath $(4)) --maccore $(abspath $(TOP)) + $(SYSTEM_MONO32) $(4)/tools/offsets-tool/MonoAotOffsetsDumper.exe --abi $(1) --out $(2) --mono $(abspath $(4)) --maccore $(abspath $(TOP)) endef CROSS_BASE_CFLAGS=-DMONOTOUCH $(CROSS_BUILD_CFLAGS) $(CCACHE_CFLAGS)