diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-12-30 17:54:40 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-01-02 13:16:17 -0700 |
| commit | dbd0a2c35d590752dfa586a816f2870e4bcb3200 (patch) | |
| tree | b3a4341fb542ac300707d5bf59a21a3273d6e6e0 /src/libcxx.zig | |
| parent | d6c5602d4665ba4e9e7c0b7f42bd00b2489d420c (diff) | |
| download | zig-dbd0a2c35d590752dfa586a816f2870e4bcb3200.tar.gz zig-dbd0a2c35d590752dfa586a816f2870e4bcb3200.zip | |
stage2: fix path to cache artifacts in libcxx,
libtsan, libunwind, and libcxxabi.
Diffstat (limited to 'src/libcxx.zig')
| -rw-r--r-- | src/libcxx.zig | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libcxx.zig b/src/libcxx.zig index 42ac1bf6ad..2da680a40d 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -219,10 +219,9 @@ pub fn buildLibCXX(comp: *Compilation) !void { assert(comp.libcxx_static_lib == null); comp.libcxx_static_lib = Compilation.CRTFile{ - .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join( - comp.gpa, - &[_][]const u8{basename}, - ), + .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{ + sub_compilation.bin_file.options.emit.?.sub_path, + }), .lock = sub_compilation.bin_file.toOwnedLock(), }; } @@ -352,10 +351,9 @@ pub fn buildLibCXXABI(comp: *Compilation) !void { assert(comp.libcxxabi_static_lib == null); comp.libcxxabi_static_lib = Compilation.CRTFile{ - .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join( - comp.gpa, - &[_][]const u8{basename}, - ), + .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join(comp.gpa, &[_][]const u8{ + sub_compilation.bin_file.options.emit.?.sub_path, + }), .lock = sub_compilation.bin_file.toOwnedLock(), }; } |