| ... | @@ -21,3 +21,31 @@ | ... | @@ -21,3 +21,31 @@ |
| 21 | - but artifact install steps also add paths for dyn libs on windows | 21 | - but artifact install steps also add paths for dyn libs on windows |
| 22 | | 22 | |
| 23 | | 23 | |
| | 24 | |
| | 25 | ## Unresolved Branch Conflicts |
| | 26 | |
| | 27 | * move max_jobs to maker not configurer |
| | 28 | |
| | 29 | +// hack for stage2_x86_64 + coff |
| | 30 | +generated_compiler_rt_dyn_lib: ?*GeneratedFile, |
| | 31 | |
| | 32 | + // hack for stage2_x86_64 + coff |
| | 33 | + if (compile.generated_compiler_rt_dyn_lib) |lp| lp.path = compile.outputPath(output_dir, .compiler_rt_dyn_lib); |
| | 34 | |
| | 35 | if (install_artifact.compiler_rt_dyn_lib_dir) |compiler_rt_dir| { |
| | 36 | const full_compiler_rt_path = b.getInstallPath(compiler_rt_dir, install_artifact.emitted_compiler_rt_dyn_lib.?.basename(b, step)); |
| | 37 | const p = try step.installFile(install_artifact.emitted_compiler_rt_dyn_lib.?, full_compiler_rt_path); |
| | 38 | all_cached = all_cached and p == .fresh; |
| | 39 | } |
| | 40 | |
| | 41 | |
| | 42 | .compiler_rt_dyn_lib_dir = switch (options.compiler_rt_dyn_lib_dir) { |
| | 43 | .disabled => null, |
| | 44 | .default => if (artifact.producesCompilerRtDynLib()) dest_dir else null, |
| | 45 | .override => |o| o, |
| | 46 | }, |
| | 47 | |
| | 48 | if (install_artifact.compiler_rt_dyn_lib_dir != null) install_artifact.emitted_compiler_rt_dyn_lib = artifact.getEmittedCompilerRtDynLib(); |
| | 49 | |
| | 50 | |
| | 51 | |
Andrew Kelley <andrew@ziglang.org> 2026-04-18 22:19:48-07:00