From 388b65aa7269108ace6ec14bd52d6ebd089fc1fa Mon Sep 17 00:00:00 2001
From: Dilum Aluthge <dilum@aluthge.com>
Date: Thu, 2 Jun 2022 09:24:12 -0400
Subject: [PATCH 1/2] Fix the message in `create_sysimg_object_file` to
 correctly say "incremental" or "nonincremental"

---
 src/PackageCompiler.jl | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl
index a2002a26..9fba4297 100644
--- a/src/PackageCompiler.jl
+++ b/src/PackageCompiler.jl
@@ -250,7 +250,8 @@ function create_sysimg_object_file(object_file::String,
                             cpu_target::String,
                             script::Union{Nothing, String},
                             sysimage_build_args::Cmd,
-                            extra_precompiles::String)
+                            extra_precompiles::String,
+                            incremental::Bool)
     # Handle precompilation
     precompile_files = String[]
     @debug "running precompilation execution script..."
@@ -352,7 +353,12 @@ function create_sysimg_object_file(object_file::String,
     cmd = `$(get_julia_cmd()) --cpu-target=$cpu_target -O3 $sysimage_build_args
                               --sysimage=$base_sysimage --project=$project --output-o=$(object_file) $outputo_file`
     @debug "running $cmd"
-    spinner = TerminalSpinners.Spinner(msg = "PackageCompiler: compiling incremental system image")
+    if incremental
+        non = ""
+    else
+        non = "non"
+    end
+    spinner = TerminalSpinners.Spinner(msg = "PackageCompiler: compiling $(non)incremental system image")
     TerminalSpinners.@spin spinner run(cmd)
     return
 end
@@ -512,7 +518,8 @@ function create_sysimage(packages::Union{Nothing, Symbol, Vector{String}, Vector
                             cpu_target,
                             script,
                             sysimage_build_args,
-                            extra_precompiles)
+                            extra_precompiles,
+                            incremental)
     object_files = [object_file]
     if julia_init_c_file !== nothing
         push!(object_files, compile_c_init_julia(julia_init_c_file, basename(sysimage_path)))

From 9013281b0d25077885d3bfa772f87017bebafb4a Mon Sep 17 00:00:00 2001
From: Dilum Aluthge <dilum@aluthge.com>
Date: Tue, 7 Jun 2022 10:38:54 -0400
Subject: [PATCH 2/2] Apply suggestions from code review

---
 src/PackageCompiler.jl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl
index 9fba4297..5e0c895f 100644
--- a/src/PackageCompiler.jl
+++ b/src/PackageCompiler.jl
@@ -353,11 +353,7 @@ function create_sysimg_object_file(object_file::String,
     cmd = `$(get_julia_cmd()) --cpu-target=$cpu_target -O3 $sysimage_build_args
                               --sysimage=$base_sysimage --project=$project --output-o=$(object_file) $outputo_file`
     @debug "running $cmd"
-    if incremental
-        non = ""
-    else
-        non = "non"
-    end
+    non = incremental ? "" : "non"
     spinner = TerminalSpinners.Spinner(msg = "PackageCompiler: compiling $(non)incremental system image")
     TerminalSpinners.@spin spinner run(cmd)
     return