mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-24 07:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig cc: freestanding target implies -nostdlib

Browse Source
This commit is contained in:
Andrew Kelley 2020-03-25 12:28:41 -04:00
parent 6cbe589b51
commit f313ab18ae
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@ -455,6 +455,7 @@ static int main0(int argc, char **argv) {
CodeModel code_model = CodeModelDefault; CodeModel code_model = CodeModelDefault;
const char *override_soname = nullptr; const char *override_soname = nullptr;
bool only_preprocess = false; bool only_preprocess = false;
bool ensure_libc_on_non_freestanding = false;
ZigList<const char *> llvm_argv = {0}; ZigList<const char *> llvm_argv = {0};
llvm_argv.append("zig (LLVM option parsing)"); llvm_argv.append("zig (LLVM option parsing)");
@ -582,11 +583,11 @@ static int main0(int argc, char **argv) {
} else if (argc >= 2 && strcmp(argv[1], "cc") == 0) { } else if (argc >= 2 && strcmp(argv[1], "cc") == 0) {
emit_h = false; emit_h = false;
strip = true; strip = true;
ensure_libc_on_non_freestanding = true;
bool c_arg = false; bool c_arg = false;
Stage2ClangArgIterator it; Stage2ClangArgIterator it;
stage2_clang_arg_iterator(&it, argc, argv); stage2_clang_arg_iterator(&it, argc, argv);
bool nostdlib = false;
bool is_shared_lib = false; bool is_shared_lib = false;
ZigList<Buf *> linker_args = {}; ZigList<Buf *> linker_args = {};
while (it.has_next) { while (it.has_next) {
@ -645,7 +646,7 @@ static int main0(int argc, char **argv) {
want_pic = WantPICDisabled; want_pic = WantPICDisabled;
break; break;
case Stage2ClangArgNoStdLib: case Stage2ClangArgNoStdLib:
nostdlib = true; ensure_libc_on_non_freestanding = false;
break; break;
case Stage2ClangArgShared: case Stage2ClangArgShared:
is_dynamic = true; is_dynamic = true;
@ -772,10 +773,6 @@ static int main0(int argc, char **argv) {
build_mode = BuildModeSafeRelease; build_mode = BuildModeSafeRelease;
} }
if (!nostdlib && !have_libc) {
have_libc = true;
link_libs.append("c");
}
if (only_preprocess) { if (only_preprocess) {
cmd = CmdBuild; cmd = CmdBuild;
out_type = OutTypeObj; out_type = OutTypeObj;
@ -1216,6 +1213,11 @@ static int main0(int argc, char **argv) {
return print_error_usage(arg0); return print_error_usage(arg0);
} }
if (!have_libc && ensure_libc_on_non_freestanding && target.os != OsFreestanding) {
have_libc = true;
link_libs.append("c");
}
Buf zig_triple_buf = BUF_INIT; Buf zig_triple_buf = BUF_INIT;
target_triple_zig(&zig_triple_buf, &target); target_triple_zig(&zig_triple_buf, &target);