authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-12-30 17:54:40-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-01-02 13:16:17-07:00
logdbd0a2c35d590752dfa586a816f2870e4bcb3200
treeb3a4341fb542ac300707d5bf59a21a3273d6e6e0
parentd6c5602d4665ba4e9e7c0b7f42bd00b2489d420c

stage2: fix path to cache artifacts in libcxx,

libtsan, libunwind, and libcxxabi.

3 files changed, 13 insertions(+), 16 deletions(-)

src/libcxx.zig+6-8
......@@ -219,10 +219,9 @@ pub fn buildLibCXX(comp: *Compilation) !void {
219219
220220 assert(comp.libcxx_static_lib == null);
221221 comp.libcxx_static_lib = Compilation.CRTFile{
222 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(
223 comp.gpa,
224 &[_][]const u8{basename},
225 ),
222 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
223 sub_compilation.bin_file.options.emit.?.sub_path,
224 }),
226225 .lock = sub_compilation.bin_file.toOwnedLock(),
227226 };
228227}
......@@ -352,10 +351,9 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
352351
353352 assert(comp.libcxxabi_static_lib == null);
354353 comp.libcxxabi_static_lib = Compilation.CRTFile{
355 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(
356 comp.gpa,
357 &[_][]const u8{basename},
358 ),
354 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
355 sub_compilation.bin_file.options.emit.?.sub_path,
356 }),
359357 .lock = sub_compilation.bin_file.toOwnedLock(),
360358 };
361359}
src/libtsan.zig+3-4
......@@ -238,10 +238,9 @@ pub fn buildTsan(comp: *Compilation) !void {
238238
239239 assert(comp.tsan_static_lib == null);
240240 comp.tsan_static_lib = Compilation.CRTFile{
241 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(
242 comp.gpa,
243 &[_][]const u8{basename},
244 ),
241 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
242 sub_compilation.bin_file.options.emit.?.sub_path,
243 }),
245244 .lock = sub_compilation.bin_file.toOwnedLock(),
246245 };
247246}
src/libunwind.zig+4-4
......@@ -142,11 +142,11 @@ pub fn buildStaticLib(comp: *Compilation) !void {
142142 try sub_compilation.updateSubCompilation();
143143
144144 assert(comp.libunwind_static_lib == null);
145
145146 comp.libunwind_static_lib = Compilation.CRTFile{
146 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(
147 comp.gpa,
148 &[_][]const u8{basename},
149 ),
147 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
148 sub_compilation.bin_file.options.emit.?.sub_path,
149 }),
150150 .lock = sub_compilation.bin_file.toOwnedLock(),
151151 };
152152}