authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-21 18:26:06-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-09-21 18:26:24-07:00
logb9f61d401502f5d221e72c0d0e3bf448b11dcd68
tree44e3e65bed0a3463b07a3e9fcf4630c07e9e36ce
parent61c54b2d49bf087465e2c9a72a190e6ee5861027

stage1: resolve builtin.zig path when bootstrapping

2 files changed, 3 insertions(+), 1 deletions(-)

BRANCH_TODO-1
...@@ -1,4 +1,3 @@...@@ -1,4 +1,3 @@
1 * resolve builtin.zig not working on windows & macos; try os_path_real
2 * build & link against libcxx and libcxxabi1 * build & link against libcxx and libcxxabi
3 * `zig test`2 * `zig test`
4 * `zig build`3 * `zig build`
src/codegen.cpp+3
...@@ -8861,6 +8861,9 @@ static Error define_builtin_compile_vars(CodeGen *g) {...@@ -8861,6 +8861,9 @@ static Error define_builtin_compile_vars(CodeGen *g) {
8861 g->builtin_zig_path = buf_alloc();8861 g->builtin_zig_path = buf_alloc();
8862 os_path_join(g->output_dir, buf_create_from_str(builtin_zig_basename), g->builtin_zig_path);8862 os_path_join(g->output_dir, buf_create_from_str(builtin_zig_basename), g->builtin_zig_path);
88638863
8864 Buf *resolve_paths[] = { g->builtin_zig_path, };
8865 *g->builtin_zig_path = os_path_resolve(resolve_paths, 1);
8866
8864 contents = codegen_generate_builtin_source(g);8867 contents = codegen_generate_builtin_source(g);
8865 if ((err = os_write_file(g->builtin_zig_path, contents))) {8868 if ((err = os_write_file(g->builtin_zig_path, contents))) {
8866 fprintf(stderr, "Unable to write file '%s': %s\n", buf_ptr(g->builtin_zig_path), err_str(err));8869 fprintf(stderr, "Unable to write file '%s': %s\n", buf_ptr(g->builtin_zig_path), err_str(err));