| author |  Andrew Kelley <andrew@ziglang.org> 2022-01-04 00:11:45-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2022-01-04 00:11:45-07:00 |
| log | b6d6152e6514dcb4e67750cbb22b90b38ebedf49 |
| tree | 7582ae1282cd4ac631c099e40677c22c8bef1d26 |
| parent | ff66a18555dc6c00bd928f48462c3fc44f86ab6c |
link: avoid creating stage2 llvm module when using stage1
4 files changed, 13 insertions(+), 4 deletions(-)
src/link/Coff.zig+4-1
| ... | @@ -409,7 +409,10 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Coff { | ... | @@ -409,7 +409,10 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Coff { |
| 409 | }, | 409 | }, |
| 410 | .ptr_width = ptr_width, | 410 | .ptr_width = ptr_width, |
| 411 | }; | 411 | }; |
| 412 | if (build_options.have_llvm and options.use_llvm) { | 412 | |
| 413 | const use_llvm = build_options.have_llvm and options.use_llvm; | ||
| 414 | const use_stage1 = build_options.is_stage1 and options.use_stage1; | ||
| 415 | if (use_llvm and !use_stage1) { | ||
| 413 | self.llvm_object = try LlvmObject.create(gpa, options); | 416 | self.llvm_object = try LlvmObject.create(gpa, options); |
| 414 | } | 417 | } |
| 415 | return self; | 418 | return self; |
src/link/Elf.zig+3-1
| ... | @@ -304,7 +304,9 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Elf { | ... | @@ -304,7 +304,9 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Elf { |
| 304 | }, | 304 | }, |
| 305 | .ptr_width = ptr_width, | 305 | .ptr_width = ptr_width, |
| 306 | }; | 306 | }; |
| 307 | if (build_options.have_llvm and options.use_llvm) { | 307 | const use_llvm = build_options.have_llvm and options.use_llvm; |
| 308 | const use_stage1 = build_options.is_stage1 and options.use_stage1; | ||
| 309 | if (use_llvm and !use_stage1) { | ||
| 308 | self.llvm_object = try LlvmObject.create(gpa, options); | 310 | self.llvm_object = try LlvmObject.create(gpa, options); |
| 309 | } | 311 | } |
| 310 | return self; | 312 | return self; |
src/link/MachO.zig+3-1
| ... | @@ -396,7 +396,9 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*MachO { | ... | @@ -396,7 +396,9 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*MachO { |
| 396 | .needs_prealloc = needs_prealloc, | 396 | .needs_prealloc = needs_prealloc, |
| 397 | }; | 397 | }; |
| 398 | 398 | ||
| 399 | if (build_options.have_llvm and options.use_llvm) { | 399 | const use_llvm = build_options.have_llvm and options.use_llvm; |
| 400 | const use_stage1 = build_options.is_stage1 and options.use_stage1; | ||
| 401 | if (use_llvm and !use_stage1) { | ||
| 400 | self.llvm_object = try LlvmObject.create(gpa, options); | 402 | self.llvm_object = try LlvmObject.create(gpa, options); |
| 401 | } | 403 | } |
| 402 | 404 |
src/link/Wasm.zig+3-1
| ... | @@ -145,7 +145,9 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Wasm { | ... | @@ -145,7 +145,9 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Wasm { |
| 145 | .allocator = gpa, | 145 | .allocator = gpa, |
| 146 | }, | 146 | }, |
| 147 | }; | 147 | }; |
| 148 | if (build_options.have_llvm and options.use_llvm) { | 148 | const use_llvm = build_options.have_llvm and options.use_llvm; |
| 149 | const use_stage1 = build_options.is_stage1 and options.use_stage1; | ||
| 150 | if (use_llvm and !use_stage1) { | ||
| 149 | self.llvm_object = try LlvmObject.create(gpa, options); | 151 | self.llvm_object = try LlvmObject.create(gpa, options); |
| 150 | } | 152 | } |
| 151 | return self; | 153 | return self; |