From cf7d0191d35978ea4d1935bb59540f534e3da008 Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Wed, 12 Oct 2022 13:29:21 -0400 Subject: [PATCH] add sysimage size to make output report --- contrib/generate_precompile.jl | 2 +- sysimage.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/generate_precompile.jl b/contrib/generate_precompile.jl index 8fd6e2542023e..c8725cec9a0f1 100644 --- a/contrib/generate_precompile.jl +++ b/contrib/generate_precompile.jl @@ -453,6 +453,6 @@ let pre_output_time = time_ns() # Print report after sysimage has been saved so all time spent can be captured Base.postoutput() do output_time = time_ns() - pre_output_time - print("Output ────── "); Base.time_print(output_time); println() + print("Output ────── "); Base.time_print(output_time) end end diff --git a/sysimage.mk b/sysimage.mk index 2d154672d8130..4ff24dbf29127 100644 --- a/sysimage.mk +++ b/sysimage.mk @@ -79,7 +79,8 @@ $$(build_private_libdir)/sys$1-o.a $$(build_private_libdir)/sys$1-bc.a : $$(buil if ! JULIA_BINDIR=$$(call cygpath_w,$(build_bindir)) WINEPATH="$$(call cygpath_w,$$(build_bindir));$$$$WINEPATH" \ JULIA_NUM_THREADS=1 \ $$(call spawn, $3) $2 -C "$$(JULIA_CPU_TARGET)" --output-$$* $$(call cygpath_w,$$@).tmp $$(JULIA_SYSIMG_BUILD_FLAGS) \ - --startup-file=no --warn-overwrite=yes --sysimage $$(call cygpath_w,$$<) $$(call cygpath_w,$$(JULIAHOME)/contrib/generate_precompile.jl) $(JULIA_PRECOMPILE); then \ + --startup-file=no --warn-overwrite=yes --sysimage $$(call cygpath_w,$$<) $$(call cygpath_w,$$(JULIAHOME)/contrib/generate_precompile.jl) $(JULIA_PRECOMPILE) \ + || ! $$(call spawn, $3) --startup-file=no --sysimage $$(call cygpath_w,$$<)--sysimage $$(call cygpath_w,$$<) -e 'println(", sysimage size: ", Base.format_bytes(filesize(unsafe_string(Base.JLOptions().image_file))))'; then \ echo '*** This error is usually fixed by running `make clean`. If the error persists$$(COMMA) try `make cleanall`. ***'; \ false; \ fi )