mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

move logic for propagating framework dirs to zig cc

Browse Source
This commit is contained in:
Andrew Kelley 2019-09-08 15:09:05 -04:00
parent ec13fa3f4a
commit 5dde3cd3bd
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/codegen.cpp
View File

@ -8774,6 +8774,11 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
}
}
for (size_t i = 0; i < g->framework_dirs.length; i += 1) {
args.append("-iframework");
args.append(g->framework_dirs.at(i));
}
//note(dimenus): appending libc headers before c_headers breaks intrinsics
//and other compiler specific items
// According to Rich Felker libc headers are supposed to go before C language headers.

4
src/main.cpp
View File

@ -784,9 +784,7 @@ int main(int argc, char **argv) {
} else if (strcmp(arg, "--library-path") == 0 || strcmp(arg, "-L") == 0) {
lib_dirs.append(argv[i]);
} else if (strcmp(arg, "-F") == 0) {
framework_dirs.append(argv[i]); // embedded linker
clang_argv.append("-iframework"); // embedded clang
clang_argv.append(argv[i]);
framework_dirs.append(argv[i]);
} else if (strcmp(arg, "--library") == 0 || strcmp(arg, "-l") == 0) {
if (strcmp(argv[i], "c") == 0)
have_libc = true;