From 0d6f835ffb582296d24a8d1dd479e2703e075ee3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 18 Oct 2019 14:05:03 +0200
Subject: Add ability to specify "compiler mode" options as part of
 config.{c,cxx}

Such options are (normally) not overridden by buildfiles and are passed
last (after cc.coptions and {c,cxx}.coptions) in the resulting command
lines. They are also cross-hinted between config.c and config.cxx. For
example:

$ b config.cxx="g++ -m64"
---
 libbuild2/cxx/init.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libbuild2/cxx')

diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx
index 9bf54eb..6237d99 100644
--- a/libbuild2/cxx/init.cxx
+++ b/libbuild2/cxx/init.cxx
@@ -391,7 +391,7 @@ namespace build2
 
         // Note: some overridable, some not.
         //
-        v.insert<path>    ("config.cxx",          true),
+        v.insert<strings> ("config.cxx",          true),
         v.insert<string>  ("config.cxx.id",       true),
         v.insert<string>  ("config.cxx.version",  true),
         v.insert<string>  ("config.cxx.target",   true),
@@ -414,6 +414,7 @@ namespace build2
         &v.insert<strings> ("config.cxx.translatable_headers", true),
 
         v.insert<process_path> ("cxx.path"),
+        v.insert<strings>      ("cxx.mode"),
         v.insert<dir_paths>    ("cxx.sys_lib_dirs"),
         v.insert<dir_paths>    ("cxx.sys_inc_dirs"),
 
@@ -612,6 +613,7 @@ namespace build2
         cm.x_info->version.major,
         cm.x_info->version.minor,
         cast<process_path>   (rs[cm.x_path]),
+        cast<strings>        (rs[cm.x_mode]),
         cast<target_triplet> (rs[cm.x_target]),
 
         cm.tstd,
-- 
cgit v1.1