motiejus/zig
1
Fork 0
Code Releases Activity

fix running tests when linking with libc

Browse Source
This commit is contained in:
Andrew Kelley
2016-02-03 23:07:55 -07:00
parent 2521afef69
commit a6d4335217
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/codegen.cpp
View File

@@ -3847,6 +3847,8 @@ static Buf *build_o(CodeGen *parent_gen, const char *oname) {
Buf *std_dir_path = buf_create_from_str(ZIG_STD_DIR);
CodeGen *child_gen = codegen_create(std_dir_path);
child_gen->link_libc = parent_gen->link_libc;
codegen_set_is_release(child_gen, parent_gen->is_release_build);
codegen_set_strip(child_gen, parent_gen->strip_debug_symbols);
@@ -3978,7 +3980,8 @@ void codegen_link(CodeGen *g, const char *out_file) {
}
if (g->is_test_build) {
Buf *test_runner_o_path = build_o(g, "test_runner");
const char *test_runner_name = g->link_libc ? "test_runner_libc" : "test_runner_nolibc";
Buf *test_runner_o_path = build_o(g, test_runner_name);
args.append(buf_ptr(test_runner_o_path));
}