aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc/compile-rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-07-13 08:05:41 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-07-13 08:05:41 +0200
commitdb73844a1e11787025a8642f69a52b5f9c87aea2 (patch)
tree439ab3e274c130759dd75bb5bd886f9bc37aa404 /libbuild2/cc/compile-rule.cxx
parent70b4532ae118accdbe11f1983a81a26927fc9065 (diff)
Fold translated *.std options into compiler mode options
This way they are accessible in ad hoc recipes.
Diffstat (limited to 'libbuild2/cc/compile-rule.cxx')
-rw-r--r--libbuild2/cc/compile-rule.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index 29d79d0..29312a8 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -893,7 +893,6 @@ namespace build2
append_options (cs, t, c_coptions);
append_options (cs, t, x_coptions);
- append_options (cs, tstd);
if (ot == otype::s)
{
@@ -3057,8 +3056,6 @@ namespace build2
append_options (args, t, c_coptions, werror);
append_options (args, t, x_coptions, werror);
- append_options (args, tstd,
- tstd.size () - (modules && clang ? 1 : 0));
switch (cclass)
{
@@ -3127,7 +3124,8 @@ namespace build2
}
}
- append_options (args, cmode);
+ append_options (args, cmode,
+ cmode.size () - (modules && clang ? 1 : 0));
append_sys_inc_options (args); // Extra system header dirs (last).
// Setup the dynamic module mapper if needed.
@@ -4312,8 +4310,6 @@ namespace build2
append_options (args, t, c_coptions, werror);
append_options (args, t, x_coptions, werror);
- append_options (args, tstd,
- tstd.size () - (modules && clang ? 1 : 0));
append_header_options (env, args, header_args, a, t, md, dd);
@@ -4359,7 +4355,8 @@ namespace build2
}
}
- append_options (args, cmode);
+ append_options (args, cmode,
+ cmode.size () - (modules && clang ? 1 : 0));
append_sys_inc_options (args);
args.push_back ("-E");
@@ -5916,7 +5913,6 @@ namespace build2
append_options (args, t, c_coptions);
append_options (args, t, x_coptions);
- append_options (args, tstd);
string out, out1; // Output options storage.
small_vector<string, 2> header_args; // Header unit options storage.