Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Commit 122ebb9

Browse files
committed
Only add crasher in debug builds
1 parent dc4ad69 commit 122ebb9

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

main/build/MacOSX/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ MONOSTUB_STATIC_LINK=$(EXTERNAL)/Xamarin.Mac.registrar.full.a
1313

1414
if !RELEASE_BUILDS
1515
HYBRID_SUSPEND_ABORT=-DHYBRID_SUSPEND_ABORT
16+
ENABLE_DEBUG_CRASHER=-DENABLE_DEBUG_CRASHER
1617
endif
1718

1819
#SDK_PATH=$(shell xcrun --sdk macosx10.8 --show-sdk-path)
@@ -49,7 +50,7 @@ dmg: render.exe app
4950
./make-dmg-bundle.sh
5051

5152
monostub.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES)
52-
g++ -g $(HYBRID_SUSPEND_ABORT) -c -Wall -m64 -o $@ monostub.mm
53+
g++ -g $(HYBRID_SUSPEND_ABORT) $(ENABLE_DEBUG_CRASHER) -c -Wall -m64 -o $@ monostub.mm
5354

5455
monostub-nogui.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES)
5556
g++ -g $(HYBRID_SUSPEND_ABORT) -DNOGUI -c -Wall -m64 -o $@ monostub.mm

main/build/MacOSX/monostub.mm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,13 @@
227227
}
228228
}
229229

230-
extern "C" void crash_me()
230+
#if ENABLE_DEBUG_CRASHER
231+
extern "C" void debug_trigger_sigsegv()
231232
{
232233
void *p = (void*)0x12345;
233234
*(int *)p = 0;
234235
}
236+
#endif
235237

236238
int
237239
main (int argc, char **argv)

main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Commands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ protected override void Run ()
205205
class InduceNativePInvokeCrashHandler : CommandHandler
206206
{
207207
[DllImport ("__Internal")]
208-
static extern void crash_me ();
208+
static extern void debug_trigger_sigsegv ();
209209

210210
protected override void Run ()
211211
{

0 commit comments

Comments
 (0)