From 53775b0999527ced0550f3abb32c4a4a715af74e Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 1 Oct 2023 21:37:02 -0700 Subject: CLI: fix -fno-clang Aro/Clang detection logic treated `-fno-clang` the same as `-fclang`. --- src/Compilation.zig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/Compilation.zig') diff --git a/src/Compilation.zig b/src/Compilation.zig index a2b02f24b0..79b93cca28 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -1049,10 +1049,14 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { // Make a decision on whether to use Clang or Aro for translate-c and compiling C files. const c_frontend: CFrontend = blk: { - if (!build_options.have_llvm) break :blk .aro; - if (options.use_clang) |explicit| if (explicit) break :blk .clang; - break :blk .clang; + if (options.use_clang) |want_clang| { + break :blk if (want_clang) .clang else .aro; + } + break :blk if (build_options.have_llvm) .clang else .aro; }; + if (!build_options.have_llvm and c_frontend == .clang) { + return error.ZigCompilerNotBuiltWithLLVMExtensions; + } const is_safe_mode = switch (options.optimize_mode) { .Debug, .ReleaseSafe => true, -- cgit v1.2.3