aboutsummaryrefslogtreecommitdiff
path: root/build2/cc/compile.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-30 10:23:27 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-30 10:23:27 +0200
commit49fd34cb82d8edae683526a5d9fdd3c86136e646 (patch)
treee5e21a1d451e813ae18033066002019998ba5b76 /build2/cc/compile.cxx
parentac379d5c0a7d8a7382649f3988eb86474d5e4a13 (diff)
Rework C/C++ standard translation in preparation for experimental/modules
Also fix bug in clang-apple versioning.
Diffstat (limited to 'build2/cc/compile.cxx')
-rw-r--r--build2/cc/compile.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 5a95169..ce96e00 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -531,7 +531,7 @@ namespace build2
hash_options (cs, t, c_coptions);
hash_options (cs, t, x_coptions);
- hash_std (cs);
+ hash_options (cs, tstd);
if (ct == otype::s)
{
@@ -1183,8 +1183,7 @@ namespace build2
//
append_options (args, t, c_coptions);
append_options (args, t, x_coptions);
-
- append_std (args);
+ append_options (args, tstd);
if (cid == compiler_id::msvc)
{
@@ -2057,8 +2056,7 @@ namespace build2
//
append_options (args, t, c_coptions);
append_options (args, t, x_coptions);
-
- append_std (args);
+ append_options (args, tstd);
if (cid == compiler_id::msvc)
{
@@ -2272,11 +2270,10 @@ namespace build2
append_options (args, t, c_coptions);
append_options (args, t, x_coptions);
+ append_options (args, tstd);
string out, out1; // Storage.
- append_std (args);
-
if (cid == compiler_id::msvc)
{
// The /F*: option variants with separate names only became available