diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-10-17 22:08:39 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-10-17 22:08:39 -0400 |
| commit | e42d86b657c2fae093fb2545e8b4b85614a0c906 (patch) | |
| tree | e7b0f9f6f509e34edeb2226569b2ae78d34cfb5a /src/glibc.cpp | |
| parent | 17aa8c3ee29fae4bfbd6acc91eed8d229f627c32 (diff) | |
| parent | 2d5b2bf1c986d037ef965bf8c9b4d8dfd5967478 (diff) | |
| download | zig-e42d86b657c2fae093fb2545e8b4b85614a0c906.tar.gz zig-e42d86b657c2fae093fb2545e8b4b85614a0c906.zip | |
Merge branch 'lun-4-progress-take-2'
closes #3362
Diffstat (limited to 'src/glibc.cpp')
| -rw-r--r-- | src/glibc.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/glibc.cpp b/src/glibc.cpp index 50ccf20efe..3361eabe5a 100644 --- a/src/glibc.cpp +++ b/src/glibc.cpp @@ -169,7 +169,7 @@ Error glibc_load_metadata(ZigGLibCAbi **out_result, Buf *zig_lib_dir, bool verbo } Error glibc_build_dummies_and_maps(CodeGen *g, const ZigGLibCAbi *glibc_abi, const ZigTarget *target, - Buf **out_dir, bool verbose) + Buf **out_dir, bool verbose, Stage2ProgressNode *progress_node) { Error err; @@ -332,8 +332,7 @@ Error glibc_build_dummies_and_maps(CodeGen *g, const ZigGLibCAbi *glibc_abi, con return err; } - CodeGen *child_gen = create_child_codegen(g, zig_file_path, OutTypeLib, nullptr); - codegen_set_out_name(child_gen, buf_create_from_str(lib->name)); + CodeGen *child_gen = create_child_codegen(g, zig_file_path, OutTypeLib, nullptr, lib->name, progress_node); codegen_set_lib_version(child_gen, lib->sover, 0, 0); child_gen->is_dynamic = true; child_gen->is_dummy_so = true; |
