Merge pull request #4279 from mikdusan/create-global-cache

stage1: make sure to create native_libc.txt dir
This commit is contained in:
Michael Dusan 2020-01-24 00:31:18 -05:00 committed by GitHub
commit aa75df36df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions

View File

@ -8996,7 +8996,10 @@ static void detect_libc(CodeGen *g) {
"See `zig libc --help` for more details.\n", err_str(err));
exit(1);
}
if ((err = os_make_path(g->cache_dir))) {
Buf libc_txt_dir = BUF_INIT;
os_path_dirname(libc_txt, &libc_txt_dir);
buf_deinit(&libc_txt_dir);
if ((err = os_make_path(&libc_txt_dir))) {
fprintf(stderr, "Unable to create %s directory: %s\n",
buf_ptr(g->cache_dir), err_str(err));
exit(1);

View File

@ -141,15 +141,15 @@ static int print_libc_usage(const char *arg0, FILE *file, int return_code) {
"You can save this into a file and then edit the paths to create a cross\n"
"compilation libc kit. Then you can pass `--libc [file]` for Zig to use it.\n"
"\n"
"When compiling natively and no `--libc` argument provided, Zig automatically\n"
"creates zig-cache/native_libc.txt so that it does not have to detect libc\n"
"on every invocation. You can remove this file to have Zig re-detect the\n"
"native libc.\n"
"When compiling natively and no `--libc` argument provided, Zig will create\n"
"`%s/native_libc.txt`\n"
"so that it does not have to detect libc on every invocation. You can remove\n"
"this file to have Zig re-detect the native libc.\n"
"\n\n"
"Usage: %s libc [file]\n"
"\n"
"Parse a libc installation text file and validate it.\n"
, arg0, arg0);
, arg0, buf_ptr(get_global_cache_dir()), arg0);
return return_code;
}