diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-09-25 13:52:05 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-09-25 14:03:26 -0400 |
| commit | c9690916e5fe04a174a142580a9990e2593e0edd (patch) | |
| tree | d009d33a82ea1fc9aa6d31e3eac23bf80a165a91 /src/link.cpp | |
| parent | 14ae23326ee3b20f706051b37c169c872337af8c (diff) | |
| download | zig-c9690916e5fe04a174a142580a9990e2593e0edd.tar.gz zig-c9690916e5fe04a174a142580a9990e2593e0edd.zip | |
fix building musl on eabihf abis, incorrect include dirs
See #3286. The issue is not fully solved however because this has
uncovered another issue.
Diffstat (limited to 'src/link.cpp')
| -rw-r--r-- | src/link.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/link.cpp b/src/link.cpp index 0d51188bb3..785b522993 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -951,11 +951,10 @@ static void musl_add_cc_args(CodeGen *parent, CFile *c_file, bool want_O3) { c_file->args.append("-I"); c_file->args.append(buf_ptr(buf_sprintf( - "%s" OS_SEP "libc" OS_SEP "include" OS_SEP "%s-%s-%s", + "%s" OS_SEP "libc" OS_SEP "include" OS_SEP "%s-%s-musl", buf_ptr(parent->zig_lib_dir), - target_arch_name(parent->zig_target->arch), - target_os_name(parent->zig_target->os), - target_abi_name(parent->zig_target->abi)))); + target_arch_musl_name(parent->zig_target->arch), + target_os_name(parent->zig_target->os)))); c_file->args.append("-I"); c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "libc" OS_SEP "include" OS_SEP "generic-musl", |