diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-10-23 19:07:10 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2019-10-23 19:07:10 +0300 |
| commit | 7e76a48545255bc0857ce3e4ed64f0c09cf9f24a (patch) | |
| tree | a16c5dc62d55af245d903252e061918cf726c2bb /main/build | |
| parent | 0c303ed5f4d9e2163afb0d93f187220edef306c7 (diff) | |
Refactor to use a dylib
Diffstat (limited to 'main/build')
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 17 | ||||
| -rw-r--r-- | main/build/MacOSX/monostub.mm | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index d821f3e673..9362dca82b 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -13,7 +13,6 @@ MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a if !RELEASE_BUILDS HYBRID_SUSPEND_ABORT=-DHYBRID_SUSPEND_ABORT -ENABLE_DEBUG_CRASHER=-DENABLE_DEBUG_CRASHER endif #SDK_PATH=$(shell xcrun --sdk macosx10.8 --show-sdk-path) @@ -41,7 +40,7 @@ MONOSTUB_RPATH=-Wl,-rpath,/Library/Frameworks/Mono.framework/Libraries/ \ -Wl,-rpath,/usr/lib/ \ -Wl,-rpath,/usr/local/lib/ -all: monostub monostub-nogui monostub-test +all: monostub monostub-nogui monostub-test debugcrash render.exe: render.cs mcs -r:System.Drawing render.cs @@ -49,6 +48,18 @@ render.exe: render.cs dmg: render.exe app ./make-dmg-bundle.sh +if !RELEASE_BUILDS +debugcrash: libdebugcrash.dylib + cp $^ ../bin +else +debugcrash: +endif + +if !RELEASE_BUILDS +libdebugcrash.dylib: debugcrash.c + clang -g -shared -fpic -o $@ $^ +endif + monostub.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES) g++ -g $(HYBRID_SUSPEND_ABORT) $(ENABLE_DEBUG_CRASHER) -c -Wall -m64 -o $@ monostub.mm @@ -161,4 +172,4 @@ app: monostub monostub-test @echo "" @rm -f missing-stuff -.PHONY: app dmg +.PHONY: app dmg debugcrash diff --git a/main/build/MacOSX/monostub.mm b/main/build/MacOSX/monostub.mm index 9fccbe0a5b..f42dd641aa 100644 --- a/main/build/MacOSX/monostub.mm +++ b/main/build/MacOSX/monostub.mm @@ -227,14 +227,6 @@ load_xammac() } } -#if ENABLE_DEBUG_CRASHER -extern "C" void debug_trigger_sigsegv() -{ - void *p = (void*)0x12345; - *(int *)p = 0; -} -#endif - int main (int argc, char **argv) { |