Merge branch 'asm-cc' of https://github.com/LemonBoy/zig into LemonBoy-asm-cc

2019-05-13 12:10:21 -04:00
parent c1793d6106 a038ef3570
commit f3db3b3c13
5 changed files with 40 additions and 69 deletions
--- a/std/build.zig
+++ b/std/build.zig
@@ -1376,7 +1376,7 @@ pub const LibExeObjStep = struct {
                    try zig_args.append(name);
                },
                LinkObject.AssemblyFile => |asm_file| {
-                    try zig_args.append("--assembly");
+                    try zig_args.append("--c-source");
                    try zig_args.append(builder.pathFromRoot(asm_file));
                },
                LinkObject.CSourceFile => |c_source_file| {