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 {...@@ -219,10 +219,9 @@ pub fn buildLibCXX(comp: *Compilation) !void {
219219
220 assert(comp.libcxx_static_lib == null);220 assert(comp.libcxx_static_lib == null);
221 comp.libcxx_static_lib = Compilation.CRTFile{221 comp.libcxx_static_lib = Compilation.CRTFile{
222 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(222 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
223 comp.gpa,223 sub_compilation.bin_file.options.emit.?.sub_path,
224 &[_][]const u8{basename},224 }),
225 ),
226 .lock = sub_compilation.bin_file.toOwnedLock(),225 .lock = sub_compilation.bin_file.toOwnedLock(),
227 };226 };
228}227}
...@@ -352,10 +351,9 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {...@@ -352,10 +351,9 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
352351
353 assert(comp.libcxxabi_static_lib == null);352 assert(comp.libcxxabi_static_lib == null);
354 comp.libcxxabi_static_lib = Compilation.CRTFile{353 comp.libcxxabi_static_lib = Compilation.CRTFile{
355 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(354 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
356 comp.gpa,355 sub_compilation.bin_file.options.emit.?.sub_path,
357 &[_][]const u8{basename},356 }),
358 ),
359 .lock = sub_compilation.bin_file.toOwnedLock(),357 .lock = sub_compilation.bin_file.toOwnedLock(),
360 };358 };
361}359}
src/libtsan.zig+3-4
...@@ -238,10 +238,9 @@ pub fn buildTsan(comp: *Compilation) !void {...@@ -238,10 +238,9 @@ pub fn buildTsan(comp: *Compilation) !void {
238238
239 assert(comp.tsan_static_lib == null);239 assert(comp.tsan_static_lib == null);
240 comp.tsan_static_lib = Compilation.CRTFile{240 comp.tsan_static_lib = Compilation.CRTFile{
241 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(241 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
242 comp.gpa,242 sub_compilation.bin_file.options.emit.?.sub_path,
243 &[_][]const u8{basename},243 }),
244 ),
245 .lock = sub_compilation.bin_file.toOwnedLock(),244 .lock = sub_compilation.bin_file.toOwnedLock(),
246 };245 };
247}246}
src/libunwind.zig+4-4
...@@ -142,11 +142,11 @@ pub fn buildStaticLib(comp: *Compilation) !void {...@@ -142,11 +142,11 @@ pub fn buildStaticLib(comp: *Compilation) !void {
142 try sub_compilation.updateSubCompilation();142 try sub_compilation.updateSubCompilation();
143143
144 assert(comp.libunwind_static_lib == null);144 assert(comp.libunwind_static_lib == null);
145
145 comp.libunwind_static_lib = Compilation.CRTFile{146 comp.libunwind_static_lib = Compilation.CRTFile{
146 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(147 .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{
147 comp.gpa,148 sub_compilation.bin_file.options.emit.?.sub_path,
148 &[_][]const u8{basename},149 }),
149 ),
150 .lock = sub_compilation.bin_file.toOwnedLock(),150 .lock = sub_compilation.bin_file.toOwnedLock(),
151 };151 };
152}152}