aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-05-13 12:10:21 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-05-13 12:10:21 -0400
commitf3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783 (patch)
tree0df5ac1ae3cb5c7cddf30391666128a7a4cae264 /std
parentc1793d61061a112dc3d58c33ac0d3a1ebc8fb35e (diff)
parenta038ef3570caed01815173d95089e016fab3a050 (diff)
downloadzig-f3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783.tar.gz
zig-f3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783.zip
Merge branch 'asm-cc' of https://github.com/LemonBoy/zig into LemonBoy-asm-cc
Diffstat (limited to 'std')
-rw-r--r--std/build.zig2
1 files changed, 1 insertions, 1 deletions
diff --git a/std/build.zig b/std/build.zig
index b5ec97ab5f..ff64c6cb93 100644
--- 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| {