Commit 3f8f0b9bba5407ed5f7279bfdb7d22afaa126674 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-09-21 11:18:49-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-09-21 11:18:49-04:00
log	3f8f0b9bba5407ed5f7279bfdb7d22afaa126674
tree	f63d6c21e29f2b5cad0c1723a2531f071061c225
parent	b97bfc3ecba9655cdd989add13a7582272659268

3 files changed, 8 insertions(+), 4 deletions(-)

src/all_types.hpp+1

src/codegen.cpp+1

...	...	@@ -63,6 +63,7 @@ CodeGen codegen_create(Buf root_source_dir, const ZigTarget *target) {
63	63	g->generic_table.init(16);
64	64	g->is_release_build = false;
65	65	g->is_test_build = false;
	66	g->want_h_file = true;
66	67
67	68	// the error.Ok value
68	69	g->error_decls.append(nullptr);

src/link.cpp+6-4

...	...	@@ -38,6 +38,7 @@ static Buf build_o(CodeGen parent_gen, const char *oname) {
38	38	ZigTarget *child_target = parent_gen->is_native_target ? nullptr : &parent_gen->zig_target;
39	39	CodeGen *child_gen = codegen_create(std_dir_path, child_target);
40	40	child_gen->link_libc = parent_gen->link_libc;
	41	child_gen->want_h_file = false;
41	42
42	43	codegen_set_is_release(child_gen, parent_gen->is_release_build);
43	44
...	...	@@ -793,10 +794,8 @@ void codegen_link(CodeGen g, const char out_file) {
793	794
794	795	buf_init_from_buf(&lj.out_file_o, &lj.out_file);
795	796
796		if (g->out_type != OutTypeObj) {
797		const char *o_ext = get_o_file_extension(g);
798		buf_append_str(&lj.out_file_o, o_ext);
799		}
	797	const char *o_ext = get_o_file_extension(g);
	798	buf_append_str(&lj.out_file_o, o_ext);
800	799
801	800	char *err_msg = nullptr;
802	801	if (LLVMTargetMachineEmitToFile(g->target_machine, g->module, buf_ptr(&lj.out_file_o),
...	...	@@ -806,6 +805,9 @@ void codegen_link(CodeGen g, const char out_file) {
806	805	}
807	806
808	807	if (g->out_type == OutTypeObj) {
	808	if (g->want_h_file) {
	809	codegen_generate_h_file(g);
	810	}
809	811	if (g->verbose) {
810	812	fprintf(stderr, "OK\n");
811	813	}