aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-06-05 20:20:29 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-06-06 13:36:31 +0300
commit6bbdd5e594deb3a7143461fe657ad495e95bbafd (patch)
tree5af6efc533af168c5efa3a6a5ec03af2ca8a08b9
parent2ffd8fecdad3caf7696ea73b8c45e7a060786045 (diff)
Make preprocessing options order consistent across preprocessing and compilation compiler runs
-rw-r--r--build2/cc/compile-rule.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index c85d939..bfbbc8a 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -2806,13 +2806,13 @@ namespace build2
if (reprocess)
args.push_back ("-D__build2_preprocess");
+ append_options (args, t, c_poptions);
+ append_options (args, t, x_poptions);
+
// Add *.export.poptions from prerequisite libraries.
//
append_lib_options (bs, args, a, t, li);
- append_options (args, t, c_poptions);
- append_options (args, t, x_poptions);
-
// Populate the src-out with the -I$out_base -I$src_base pairs.
//
{
@@ -4053,11 +4053,11 @@ namespace build2
if (reprocess)
args.push_back ("-D__build2_preprocess");
- append_lib_options (t.base_scope (), args, a, t, li);
-
append_options (args, t, c_poptions);
append_options (args, t, x_poptions);
+ append_lib_options (t.base_scope (), args, a, t, li);
+
assert (sys_inc_dirs_extra <= sys_inc_dirs.size ());
append_option_values (
args, "-I",