From 8f35c60b39dad1ecb1609f6105f1e41a52df87ae Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 14 May 2021 12:24:47 -0700 Subject: [PATCH] stage2: clarify logic of passing `-integrated-as` to clang make it clear that the logic is only there to lower the amount of noise on the clang command line. --- src/Compilation.zig | 4 +--- src/target.zig | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Compilation.zig b/src/Compilation.zig index 6a73bd9ca9..f8ef492d78 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -2695,9 +2695,7 @@ pub fn addCCArgs( try argv.appendSlice(&[_][]const u8{ "-MD", "-MV", "-MF", p }); } - if (target.cpu.arch.isSPARC()) { - // Clang defaults to using the system assembler over the internal one - // when targeting a non-BSD OS. + if (target_util.clangMightShellOutForAssembly(target)) { try argv.append("-integrated-as"); } diff --git a/src/target.zig b/src/target.zig index c2018db012..28b4771d0a 100644 --- a/src/target.zig +++ b/src/target.zig @@ -395,3 +395,9 @@ pub fn libcFullLinkFlags(target: std.Target) []const []const u8 { }, }; } + +pub fn clangMightShellOutForAssembly(target: std.Target) bool { + // Clang defaults to using the system assembler over the internal one + // when targeting a non-BSD OS. + return target.cpu.arch.isSPARC(); +}