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/utility.cxx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'libbuild2/utility.cxx') diff --git a/libbuild2/utility.cxx b/libbuild2/utility.cxx index af4768c..78d2df2 100644 --- a/libbuild2/utility.cxx +++ b/libbuild2/utility.cxx @@ -386,13 +386,17 @@ namespace build2 } bool - find_options (initializer_list os, const lookup& l, bool ic) + find_options (const initializer_list& os, + const lookup& l, + bool ic) { return l && find_options (os, cast (l), ic); } bool - find_options (initializer_list os, const strings& strs, bool ic) + find_options (const initializer_list& os, + const strings& strs, + bool ic) { for (const string& s: strs) for (const char* o: os) @@ -403,7 +407,7 @@ namespace build2 } bool - find_options (initializer_list os, + find_options (const initializer_list& os, const cstrings& cstrs, bool ic) { @@ -447,7 +451,7 @@ namespace build2 } const string* - find_option_prefixes (initializer_list ps, + find_option_prefixes (const initializer_list& ps, const lookup& l, bool ic) { @@ -455,7 +459,7 @@ namespace build2 } const string* - find_option_prefixes (initializer_list ps, + find_option_prefixes (const initializer_list& ps, const strings& strs, bool ic) { @@ -470,7 +474,7 @@ namespace build2 } const char* - find_option_prefixes (initializer_list ps, + find_option_prefixes (const initializer_list& ps, const cstrings& cstrs, bool ic) { -- cgit v1.1