micro-optimize the non augmented case

Author: vchuravy

src/toplevel_generators.jl

@@ -31,19 +31,13 @@ function generate_imports(src_name)
             using Pkg.Artifacts: load_artifacts_toml, unpack_platform
             using Pkg.BinaryPlatforms: triplet, select_platform
             HostPlatform() = platform_key_abi()
-            if !@isdefined(augment_platform!)
-                augment_platform!(platform) = platform
-            end
         end
     else
         # Use fast stdlib-based Artifacts + Preferences
         return quote
             using Libdl, Artifacts, JLLWrappers.Preferences, Base.BinaryPlatforms
             using Artifacts: load_artifacts_toml, unpack_platform
             using Base.BinaryPlatforms: triplet, select_platform
-            if !@isdefined(augment_platform!)
-                augment_platform!(platform) = platform
-            end
         end
     end
 end
@@ -126,7 +120,11 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__)
         # running at toplevel, and therefore will be run completely at compile-time.  We use
         # a `let` block here to avoid storing unnecessary data in our `.ji` files
 
-        const host_platform = augment_platform!(HostPlatform())
+        if @isdefined(augment_platform!)
+            const host_platform = augment_platform!(HostPlatform())
+        else
+            const host_platform = nothing
+        end
         best_wrapper = let
             artifacts_toml = joinpath($(pkg_dir), "..", "Artifacts.toml")
             valid_wrappers = Dict{Platform,String}()
@@ -165,7 +163,11 @@ function generate_wrapper_load(src_name, pkg_uuid, __source__)
                 end
 
                 # From the available options, choose the best wrapper script
-                select_platform(valid_wrappers, host_platform)
+                if host_platform !== nothing
+                    select_platform(valid_wrappers, host_platform)
+                else
+                    select_platform(valid_wrappers)
+                end
             end
         end
 

src/wrapper_generators.jl

@@ -4,20 +4,17 @@ include("products/library_generators.jl")
 
 macro generate_wrapper_header(src_name)
     pkg_dir = dirname(dirname(String(__source__.file)))
-    if VERSION >= v"1.6"
-        artifact_expr = Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name, :(host_platform))
-    else
-        artifact_expr = Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name)
-    end
     return esc(quote
         function find_artifact_dir()
             # We determine at compile-time whether our JLL package has been dev'ed and overridden
             @static if isdir(joinpath(dirname($(pkg_dir)), "override"))
                 return joinpath(dirname($(pkg_dir)), "override")
+            elseif @isdefined(augment_platform!) && VERSION >= v"1.6"
+                $(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name, :(host_platform)))
             else
                 # We explicitly use `macrocall` here so that we can manually pass the `__source__`
                 # argument, to avoid `@artifact_str` trying to lookup `Artifacts.toml` here.
-                return $(artifact_expr)
+                return $(Expr(:macrocall, Symbol("@artifact_str"), __source__, src_name))
             end
         end
         function find_or_instantiate_artifact_dir()