From c25742010d69e0e56f1fda99f1b986be52165e3b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 16 Feb 2020 19:02:26 -0500 Subject: [PATCH] add the dummy libc paths back in --- CMakeLists.txt | 2 +- src/userland.cpp | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 950aa70ce1..b990261d08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -606,7 +606,7 @@ endif() if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") set(LIBUSERLAND_RELEASE_ARG "") else() - set(LIBUSERLAND_RELEASE_ARG "--release-fast --strip") + set(LIBUSERLAND_RELEASE_ARG --release-fast --strip) endif() if(WIN32) set(LIBUSERLAND_WINDOWS_ARGS "-lntdll") diff --git a/src/userland.cpp b/src/userland.cpp index 539735f436..2be97f22d6 100644 --- a/src/userland.cpp +++ b/src/userland.cpp @@ -146,8 +146,19 @@ int stage2_cmd_targets(const char *zig_triple) { } enum Error stage2_libc_parse(struct Stage2LibCInstallation *libc, const char *libc_file) { - const char *msg = "stage0 called stage2_libc_parse"; - stage2_panic(msg, strlen(msg)); + libc->include_dir = "/dummy/include"; + libc->include_dir_len = strlen(libc->include_dir); + libc->sys_include_dir = "/dummy/sys/include"; + libc->sys_include_dir_len = strlen(libc->sys_include_dir); + libc->crt_dir = ""; + libc->crt_dir_len = strlen(libc->crt_dir); + libc->static_crt_dir = ""; + libc->static_crt_dir_len = strlen(libc->static_crt_dir); + libc->msvc_lib_dir = ""; + libc->msvc_lib_dir_len = strlen(libc->msvc_lib_dir); + libc->kernel32_lib_dir = ""; + libc->kernel32_lib_dir_len = strlen(libc->kernel32_lib_dir); + return ErrorNone; } enum Error stage2_libc_render(struct Stage2LibCInstallation *self, FILE *file) {