From 0d6f835ffb582296d24a8d1dd479e2703e075ee3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov 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/cc/gcc.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libbuild2/cc/gcc.cxx') diff --git a/libbuild2/cc/gcc.cxx b/libbuild2/cc/gcc.cxx index 9eb8925..cf0ccdc 100644 --- a/libbuild2/cc/gcc.cxx +++ b/libbuild2/cc/gcc.cxx @@ -31,13 +31,11 @@ namespace build2 { dir_paths r; - cstrings args; - string std; // Storage. - - args.push_back (xc.recall_string ()); + cstrings args {xc.recall_string ()}; append_options (args, rs, c_coptions); append_options (args, rs, x_coptions); append_options (args, tstd); + append_options (args, rs, x_mode); // Compile as. // @@ -182,15 +180,13 @@ namespace build2 // dir_paths r; - cstrings args; - string std; // Storage. - - args.push_back (xc.recall_string ()); + cstrings args {xc.recall_string ()}; append_options (args, rs, c_coptions); append_options (args, rs, x_coptions); append_options (args, tstd); append_options (args, rs, c_loptions); append_options (args, rs, x_loptions); + append_options (args, rs, x_mode); args.push_back ("-print-search-dirs"); args.push_back (nullptr); -- cgit v1.1