authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-25 13:52:05-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-25 14:03:26-04:00
logc9690916e5fe04a174a142580a9990e2593e0edd
treed009d33a82ea1fc9aa6d31e3eac23bf80a165a91
parent14ae23326ee3b20f706051b37c169c872337af8c
signaturelock-open Commit is signed but in an unrecognized format.

fix building musl on eabihf abis, incorrect include dirs

See #3286. The issue is not fully solved however because this has uncovered another issue.

1 files changed, 3 insertions(+), 4 deletions(-)

src/link.cpp+3-4
......@@ -951,11 +951,10 @@ static void musl_add_cc_args(CodeGen *parent, CFile *c_file, bool want_O3) {
951951
952952 c_file->args.append("-I");
953953 c_file->args.append(buf_ptr(buf_sprintf(
954 "%s" OS_SEP "libc" OS_SEP "include" OS_SEP "%s-%s-%s",
954 "%s" OS_SEP "libc" OS_SEP "include" OS_SEP "%s-%s-musl",
955955 buf_ptr(parent->zig_lib_dir),
956 target_arch_name(parent->zig_target->arch),
957 target_os_name(parent->zig_target->os),
958 target_abi_name(parent->zig_target->abi))));
956 target_arch_musl_name(parent->zig_target->arch),
957 target_os_name(parent->zig_target->os))));
959958
960959 c_file->args.append("-I");
961960 c_file->args.append(buf_ptr(buf_sprintf("%s" OS_SEP "libc" OS_SEP "include" OS_SEP "generic-musl",