From c9690916e5fe04a174a142580a9990e2593e0edd Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 25 Sep 2019 13:52:05 -0400 Subject: fix building musl on eabihf abis, incorrect include dirs See #3286. The issue is not fully solved however because this has uncovered another issue. --- src/link.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/link.cpp') 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", -- cgit v1.2.3