From 1ac5468eff75365f52d73745f0f4cf5e9052d211 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 29 Nov 2023 08:52:35 +0200 Subject: Complete earlier fix for modules support in Clang --- libbuild2/cc/compile-rule.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx index 0755eef..f77e0fb 100644 --- a/libbuild2/cc/compile-rule.cxx +++ b/libbuild2/cc/compile-rule.cxx @@ -3698,7 +3698,7 @@ namespace build2 } case compiler_class::gcc: { - append_options (args, cmode, cmode.size ()); + append_options (args, cmode); append_sys_hdr_options (args); // Extra system header dirs (last). // If not gen, then stderr is discarded. @@ -5150,8 +5150,6 @@ namespace build2 case compiler_class::msvc: werror = "/WX"; break; } - bool clang (ctype == compiler_type::clang); - append_options (args, t, c_coptions, werror); append_options (args, t, x_coptions, werror); @@ -5214,8 +5212,7 @@ namespace build2 } case compiler_class::gcc: { - append_options (args, cmode, - cmode.size () - (modules && clang ? 1 : 0)); + append_options (args, cmode); append_sys_hdr_options (args); // Note: no append_diag_color_options() call since the -- cgit v1.1