diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index 385914e3ca0f1e..a45bbe9f9a3343 100644 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -695,11 +695,6 @@ def __init__(self, coreclr_args): if coreclr_args.crossgen2: self.corerun = os.path.join(self.core_root, self.corerun_tool_name) - if coreclr_args.dotnet_tool_path is None: - self.crossgen2_driver_tool = self.corerun - else: - self.crossgen2_driver_tool = coreclr_args.dotnet_tool_path - logging.debug("Using crossgen2 driver tool %s", self.crossgen2_driver_tool) if coreclr_args.pmi or coreclr_args.crossgen2: self.assemblies = coreclr_args.assemblies @@ -1089,7 +1084,7 @@ async def run_crossgen2(print_prefix, assembly, self): # Log what is in the response file write_file_to_log(rsp_filepath) - command = [self.crossgen2_driver_tool, self.coreclr_args.crossgen2_tool_path, "@" + rsp_filepath] + command = [self.coreclr_args.crossgen2_tool_path, "@" + rsp_filepath] command_string = " ".join(command) logging.debug("%s%s", print_prefix, command_string) @@ -4916,24 +4911,14 @@ def verify_base_diff_args(): if coreclr_args.crossgen2: # Can we find crossgen2? - crossgen2_tool_name = "crossgen2.dll" + crossgen2_tool_name = "crossgen2.exe" if platform.system() == "Windows" else "crossgen2" crossgen2_tool_path = os.path.abspath(os.path.join(coreclr_args.core_root, "crossgen2", crossgen2_tool_name)) if not os.path.exists(crossgen2_tool_path): print("`--crossgen2` is specified, but couldn't find " + crossgen2_tool_path + ". (Is it built?)") sys.exit(1) - # Which dotnet will we use to run it? - dotnet_script_name = "dotnet.cmd" if platform.system() == "Windows" else "dotnet.sh" - dotnet_tool_path = os.path.abspath(os.path.join(coreclr_args.runtime_repo_location, dotnet_script_name)) - if not os.path.exists(dotnet_tool_path): - dotnet_tool_name = determine_dotnet_tool_name(coreclr_args) - dotnet_tool_path = find_tool(coreclr_args, dotnet_tool_name, search_core_root=False, search_product_location=False, search_path=True, throw_on_not_found=False) # Only search path - coreclr_args.crossgen2_tool_path = crossgen2_tool_path - coreclr_args.dotnet_tool_path = dotnet_tool_path logging.debug("Using crossgen2 tool %s", coreclr_args.crossgen2_tool_path) - if coreclr_args.dotnet_tool_path is not None: - logging.debug("Using dotnet tool %s", coreclr_args.dotnet_tool_path) if coreclr_args.nativeaot: # Can we find nativeaot?