authorgravatar for jmi2k@openmailbox.orgJosé Miguel Sánchez <jmi2k@openmailbox.org> 2016-05-12 19:55:50+02:00
committergravatar for jmi2k@openmailbox.orgJosé Miguel Sánchez <jmi2k@openmailbox.org> 2016-05-12 19:55:50+02:00
logb7b864e5e5cb3898c2632ff7a79fd3fbbf03e59b
treeea93759810ff5cd1d137938f9a5770c331570289
parenta1817f462a06cca5cb25609b892dbff73db8a938

For the sake of correctness: we can always rely on ZIG_STD_DIR

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

src/codegen.cpp+1-2
...@@ -72,6 +72,7 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {...@@ -72,6 +72,7 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
72 g->root_package = new_package(buf_ptr(root_source_dir), "");72 g->root_package = new_package(buf_ptr(root_source_dir), "");
73 g->std_package = new_package(ZIG_STD_DIR, "index.zig");73 g->std_package = new_package(ZIG_STD_DIR, "index.zig");
74 g->root_package->package_table.put(buf_create_from_str("std"), g->std_package);74 g->root_package->package_table.put(buf_create_from_str("std"), g->std_package);
75 g->zig_std_dir = buf_create_from_str(ZIG_STD_DIR);
7576
7677
77 if (target) {78 if (target) {
...@@ -84,7 +85,6 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {...@@ -84,7 +85,6 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
84 g->libc_lib_dir = buf_create_from_str("");85 g->libc_lib_dir = buf_create_from_str("");
85 g->libc_static_lib_dir = buf_create_from_str("");86 g->libc_static_lib_dir = buf_create_from_str("");
86 g->libc_include_dir = buf_create_from_str("");87 g->libc_include_dir = buf_create_from_str("");
87 g->zig_std_dir = buf_create_from_str("");
88 g->linker_path = buf_create_from_str("");88 g->linker_path = buf_create_from_str("");
89 g->ar_path = buf_create_from_str("");89 g->ar_path = buf_create_from_str("");
90 g->darwin_linker_version = buf_create_from_str("");90 g->darwin_linker_version = buf_create_from_str("");
...@@ -97,7 +97,6 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {...@@ -97,7 +97,6 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
97 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);97 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);
98 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);98 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);
99 g->libc_include_dir = buf_create_from_str(ZIG_LIBC_INCLUDE_DIR);99 g->libc_include_dir = buf_create_from_str(ZIG_LIBC_INCLUDE_DIR);
100 g->zig_std_dir = buf_create_from_str(ZIG_STD_DIR);
101 g->linker_path = buf_create_from_str(ZIG_LD_PATH);100 g->linker_path = buf_create_from_str(ZIG_LD_PATH);
102 g->ar_path = buf_create_from_str(ZIG_AR_PATH);101 g->ar_path = buf_create_from_str(ZIG_AR_PATH);
103 g->darwin_linker_version = buf_create_from_str(ZIG_HOST_LINK_VERSION);102 g->darwin_linker_version = buf_create_from_str(ZIG_HOST_LINK_VERSION);