aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-11-29 08:52:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-11-29 09:22:26 +0200
commit1ac5468eff75365f52d73745f0f4cf5e9052d211 (patch)
treef83124209134d3c2a1707d72d48ee2f2496b69b2
parent61699217beb4779ff23eea893762c5cf14053763 (diff)
Complete earlier fix for modules support in Clang
-rw-r--r--libbuild2/cc/compile-rule.cxx7
1 files 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