Commit e1bf74fca3de7943b8f7c15be4da3dbc8e3da17e | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-04-21 20:19:48-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-04-25 00:06:58-04:00
log	e1bf74fca3de7943b8f7c15be4da3dbc8e3da17e
tree	177a4093eae23bd6e1f5bb3c990dee4cccbdf033
parent	535d4195907de8a7e494b0480c394634d4c6034a
signature	Commit is signed but in an unrecognized format.

translate-c: put -x c back in there, it's necessary

3 files changed, 23 insertions(+), 9 deletions(-)

src/codegen.cpp+13-8

 @@ -8155,6 +8155,11 @@ static void detect_libc(CodeGen *g) {
 // does not add the "cc" arg
 void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_path, bool translate_c) {
+    if (translate_c) {
+        args.append("-x");
+        args.append("c");
+    }
     if (out_dep_path != nullptr) {
         args.append("-MD");
         args.append("-MV");
 @@ -8166,13 +8171,6 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
     args.append("-fno-spell-checking");
     if (translate_c) {
-        // TODO these args shouldn't be special from the non-translate-c args, probably.
-        args.append("-nobuiltininc");
-        args.append("-nostdinc++");
-        if (g->libc_link_lib == nullptr) {
-            args.append("-nolibc");
-        }
         // this gives us access to preprocessing entities, presumably at
         // the cost of performance
         args.append("-Xclang");
 @@ -8293,9 +8291,16 @@ void codegen_translate_c(CodeGen *g, Buf *full_path, FILE *out_file, bool use_us
     ZigList<const char *> clang_argv = {0};
     add_cc_args(g, clang_argv, nullptr, true);
-    clang_argv.append("-c");
     clang_argv.append(buf_ptr(full_path));
+    if (g->verbose_cc) {
+        fprintf(stderr, "clang");
+        for (size_t i = 0; i < clang_argv.length; i += 1) {
+            fprintf(stderr, " %s", clang_argv.at(i));
+        }
+        fprintf(stderr, "\n");
+    }
     clang_argv.append(nullptr); // to make the [start...end] argument work
     const char *resources_path = buf_ptr(g->zig_c_headers_dir);

src/ir.cpp+8-1

 @@ -19098,9 +19098,16 @@ static IrInstruction *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruct
         add_cc_args(ira->codegen, clang_argv, buf_ptr(tmp_dep_file), true);
-        clang_argv.append("-c");
         clang_argv.append(buf_ptr(&tmp_c_file_path));
+        if (ira->codegen->verbose_cc) {
+            fprintf(stderr, "clang");
+            for (size_t i = 0; i < clang_argv.length; i += 1) {
+                fprintf(stderr, " %s", clang_argv.at(i));
+            }
+            fprintf(stderr, "\n");
+        }
         clang_argv.append(nullptr); // to make the [start...end] argument work
         AstNode *root_node;

src/translate_c.cpp+2

...	@@ -5060,5 +5060,7 @@ Error parse_h_file(CodeGen codegen, AstNode *out_root_node,	...	@@ -5060,5 +5060,7 @@ Error parse_h_file(CodeGen codegen, AstNode *out_root_node,
5060		5060
5061	*out_root_node = c->root;	5061	*out_root_node = c->root;
5062		5062
		5063	ZigClangASTUnit_delete(ast_unit);
		5064
5063	return ErrorNone;	5065	return ErrorNone;
5064	}	5066	}