Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add the dummy libc paths back in

Browse Source
This commit is contained in:
Andrew Kelley 2020-02-16 19:02:26 -05:00
parent 7eb0a3edce
commit c25742010d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -606,7 +606,7 @@ endif()
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(LIBUSERLAND_RELEASE_ARG "") set(LIBUSERLAND_RELEASE_ARG "")
else() else()
set(LIBUSERLAND_RELEASE_ARG "--release-fast --strip") set(LIBUSERLAND_RELEASE_ARG --release-fast --strip)
endif() endif()
if(WIN32) if(WIN32)
set(LIBUSERLAND_WINDOWS_ARGS "-lntdll") set(LIBUSERLAND_WINDOWS_ARGS "-lntdll")

15
src/userland.cpp
View File

@ -146,8 +146,19 @@ int stage2_cmd_targets(const char *zig_triple) {
} }
enum Error stage2_libc_parse(struct Stage2LibCInstallation *libc, const char *libc_file) { enum Error stage2_libc_parse(struct Stage2LibCInstallation *libc, const char *libc_file) {
const char *msg = "stage0 called stage2_libc_parse"; libc->include_dir = "/dummy/include";
stage2_panic(msg, strlen(msg)); 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) { enum Error stage2_libc_render(struct Stage2LibCInstallation *self, FILE *file) {