authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-02-16 19:02:26-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-02-16 19:02:26-05:00
logc25742010d69e0e56f1fda99f1b986be52165e3b
treeedf3a9892df523fb66dfd4fc690c02c2bd24d439
parent7eb0a3edcef2ab752ff1e45e6f1316b633b29606

add the dummy libc paths back in

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

CMakeLists.txt+1-1
......@@ -606,7 +606,7 @@ endif()
606606if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
607607 set(LIBUSERLAND_RELEASE_ARG "")
608608else()
609 set(LIBUSERLAND_RELEASE_ARG "--release-fast --strip")
609 set(LIBUSERLAND_RELEASE_ARG --release-fast --strip)
610610endif()
611611if(WIN32)
612612 set(LIBUSERLAND_WINDOWS_ARGS "-lntdll")
src/userland.cpp+13-2
......@@ -146,8 +146,19 @@ int stage2_cmd_targets(const char *zig_triple) {
146146}
147147
148148enum Error stage2_libc_parse(struct Stage2LibCInstallation *libc, const char *libc_file) {
149 const char *msg = "stage0 called stage2_libc_parse";
150 stage2_panic(msg, strlen(msg));
149 libc->include_dir = "/dummy/include";
150 libc->include_dir_len = strlen(libc->include_dir);
151 libc->sys_include_dir = "/dummy/sys/include";
152 libc->sys_include_dir_len = strlen(libc->sys_include_dir);
153 libc->crt_dir = "";
154 libc->crt_dir_len = strlen(libc->crt_dir);
155 libc->static_crt_dir = "";
156 libc->static_crt_dir_len = strlen(libc->static_crt_dir);
157 libc->msvc_lib_dir = "";
158 libc->msvc_lib_dir_len = strlen(libc->msvc_lib_dir);
159 libc->kernel32_lib_dir = "";
160 libc->kernel32_lib_dir_len = strlen(libc->kernel32_lib_dir);
161 return ErrorNone;
151162}
152163
153164enum Error stage2_libc_render(struct Stage2LibCInstallation *self, FILE *file) {