diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-09-26 12:42:07 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-09-26 12:42:07 -0700 |
| commit | 26f2f9bf1c774caf246317b3fc032449e982a150 (patch) | |
| tree | 43bc4d4b19cea9a245d87f105841d075ab75f5ab /src/libcxx.zig | |
| parent | 9b83112a1f6af758a1a995ea8838a2319d2fbc1e (diff) | |
| download | zig-26f2f9bf1c774caf246317b3fc032449e982a150.tar.gz zig-26f2f9bf1c774caf246317b3fc032449e982a150.zip | |
stage2: implement -fno-emit-bin
we are now passing the cli tests
Diffstat (limited to 'src/libcxx.zig')
| -rw-r--r-- | src/libcxx.zig | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libcxx.zig b/src/libcxx.zig index 16c9581f82..19987082aa 100644 --- a/src/libcxx.zig +++ b/src/libcxx.zig @@ -189,7 +189,10 @@ 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.directory.join(comp.gpa, &[_][]const u8{basename}), + .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join( + comp.gpa, + &[_][]const u8{basename}, + ), .lock = sub_compilation.bin_file.toOwnedLock(), }; } @@ -303,7 +306,10 @@ 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.directory.join(comp.gpa, &[_][]const u8{basename}), + .full_object_path = try sub_compilation.bin_file.options.emit.?.directory.join( + comp.gpa, + &[_][]const u8{basename}, + ), .lock = sub_compilation.bin_file.toOwnedLock(), }; } |