aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-12-12 18:56:39 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-12-12 18:56:39 -0500
commit7699b5b997c7a024a6d9558df0ec72d71ef402fe (patch)
treeea996d6252efe24158a802fb50c1a28c3b3d6717 /src/main.cpp
parent81f1f72197113a45e827d5c984e219a28aa28083 (diff)
parentfff3c1fff4c3ebfcb2bd4f08a43ae7815b5c446b (diff)
downloadzig-7699b5b997c7a024a6d9558df0ec72d71ef402fe.tar.gz
zig-7699b5b997c7a024a6d9558df0ec72d71ef402fe.zip
Merge branch 'Xe-expose-callMain'
closes #3891
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 5739f68df4..a6b26893b9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -623,7 +623,7 @@ int main(int argc, char **argv) {
ZigPackage *build_pkg = codegen_create_package(g, buf_ptr(&build_file_dirname),
buf_ptr(&build_file_basename), "std.special");
- g->root_package->package_table.put(buf_create_from_str("@build"), build_pkg);
+ g->main_pkg->package_table.put(buf_create_from_str("@build"), build_pkg);
g->enable_cache = get_cache_opt(enable_cache, true);
codegen_build_and_link(g);
if (root_progress_node != nullptr) {
@@ -1269,7 +1269,7 @@ int main(int argc, char **argv) {
codegen_set_test_name_prefix(g, buf_create_from_str(test_name_prefix));
}
- add_package(g, cur_pkg, g->root_package);
+ add_package(g, cur_pkg, g->main_pkg);
if (cmd == CmdBuild || cmd == CmdRun || cmd == CmdTest) {
g->c_source_files = c_source_files;