Merge branch 'pharo-10' into integrating-new-format

pharo-project · Feb 9, 2024 · 49c64c3 · 49c64c3
2 parents 8c674e1 + 4d0ce57
commit 49c64c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/cmake/vmmaker.cmake b/cmake/vmmaker.cmake
@@ -144,7 +144,7 @@ if(GENERATE_SOURCES)
     #Custom command that generates the vm source code from VMMaker into the generated folder
     add_custom_command(
         OUTPUT ${VMSOURCEFILES} ${PLUGIN_GENERATED_FILES}
-        COMMAND ${VMMAKER_VM} --headless ${VMMAKER_IMAGE} --no-default-preferences eval \"PharoVMMaker generate: \#\'${FLAVOUR}\' outputDirectory: \'${CMAKE_CURRENT_BINARY_DIR_TO_OUT}\'\"
+        COMMAND ${VMMAKER_VM} --headless ${VMMAKER_IMAGE} --no-default-preferences perform PharoVMMaker generate:outputDirectory: ${FLAVOUR} ${CMAKE_CURRENT_BINARY_DIR_TO_OUT}
         DEPENDS vmmaker ${VMMAKER_IMAGE} ${VMMAKER_VM}
         COMMENT "Generating VM files for flavour: ${FLAVOUR}")
 

diff --git a/src/debugUnix.c b/src/debugUnix.c
@@ -58,12 +58,16 @@ void doReport(char* fault, ucontext_t *uap){
 	crashdumpFileName[0] = 0;
 	getCrashDumpFilenameInto(crashdumpFileName);
 	crashDumpFile = fopen(crashdumpFileName, "a+");
-	vm_setVMOutputStream(crashDumpFile);
-
-	reportStackState(fault, ctimebuf, 1, uap, crashDumpFile);
+	if (crashDumpFile != NULL) {
+		vm_setVMOutputStream(crashDumpFile);
+
+		reportStackState(fault, ctimebuf, 1, uap, crashDumpFile);
+	}
 
 	vm_setVMOutputStream(stderr);
-	fclose(crashDumpFile);
+	if (crashDumpFile != NULL) {
+		fclose(crashDumpFile);
+	}
 
 	reportStackState(fault, ctimebuf, 1, uap, stderr);