From 891b90b9d8341289babfb7e681ec6f87f2b4ed36 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 6 Apr 2017 21:09:17 -0400 Subject: [PATCH] [runtime] Update the offsets tool to a new version of CppSharp and use 64 bit binaries on osx. (#4659) --- tools/offsets-tool/Makefile | 6 +++--- tools/offsets-tool/MonoAotOffsetsDumper.cs | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/offsets-tool/Makefile b/tools/offsets-tool/Makefile index 4869bf29172..c974d0364ae 100644 --- a/tools/offsets-tool/Makefile +++ b/tools/offsets-tool/Makefile @@ -20,7 +20,7 @@ else endif ifeq ($(UNAME_S),Darwin) CPPSHARP_OS=osx - CPPSHARP_ARCH=32 + CPPSHARP_ARCH=64 endif endif @@ -36,7 +36,7 @@ SRC_ROOT = ../.. MONO_OPTIONS_SRC = $(SRC_ROOT)/mcs/class/Mono.Options/Mono.Options/Options.cs -HASH=60f763a9 +HASH=9dc880dd .stamp-clone-$(HASH): rm -Rf $(CPPSHARP_BASE_DIR) git clone -b $(HASH) --depth 1 git://github.com/xamarin/CppSharpBinaries.git $(CPPSHARP_BASE_DIR) && touch $@ @@ -62,4 +62,4 @@ update: gen-proj: $(CPPSHARP_DIR)/premake5 vs2012 -all: MonoAotOffsetsDumper.exe \ No newline at end of file +all: MonoAotOffsetsDumper.exe diff --git a/tools/offsets-tool/MonoAotOffsetsDumper.cs b/tools/offsets-tool/MonoAotOffsetsDumper.cs index f167566eef3..54016f99faa 100644 --- a/tools/offsets-tool/MonoAotOffsetsDumper.cs +++ b/tools/offsets-tool/MonoAotOffsetsDumper.cs @@ -219,8 +219,7 @@ namespace CppSharp var options = new DriverOptions(); - var log = new TextDiagnosticPrinter(); - var driver = new Driver(options, log); + var driver = new Driver(options); Setup(driver, target); driver.Setup(); -- 2.25.1