diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-11-29 13:59:20 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-11-29 14:02:11 +0200 |
| commit | bdbb7e2535009b2a142567a2235ac0a71352c749 (patch) | |
| tree | e0d591f0c78539293edd4566dd1cbdd6d8cbccbe /libbuild2/cc/compile-rule.cxx | |
| parent | f3b876a46c9739c28c1a9e25ce95ec689713038b (diff) | |
Reorder {cc,c/cxx}.{poptions,loptions}
Now it is c/cxx first followed by cc which is the reverse order of coptions
since the header/library search paths are examined in the order specified (in
contrast to the "last value wins" semantics that we assume for coptions).
Diffstat (limited to 'libbuild2/cc/compile-rule.cxx')
| -rw-r--r-- | libbuild2/cc/compile-rule.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx index da958f4..328b65e 100644 --- a/libbuild2/cc/compile-rule.cxx +++ b/libbuild2/cc/compile-rule.cxx @@ -860,8 +860,8 @@ namespace build2 if (md.pp != preprocessed::all) { - append_options (cs, t, c_poptions); append_options (cs, t, x_poptions); + append_options (cs, t, c_poptions); // Hash *.export.poptions from prerequisite libraries. // @@ -1416,8 +1416,8 @@ namespace build2 // First process our own. // - append_prefixes (m, t, c_poptions); append_prefixes (m, t, x_poptions); + append_prefixes (m, t, c_poptions); // Then process the include directories from prerequisite libraries. // @@ -2807,8 +2807,8 @@ namespace build2 if (reprocess) args.push_back ("-D__build2_preprocess"); - append_options (args, t, c_poptions); append_options (args, t, x_poptions); + append_options (args, t, c_poptions); // Add *.export.poptions from prerequisite libraries. // @@ -4075,8 +4075,8 @@ namespace build2 if (reprocess) args.push_back ("-D__build2_preprocess"); - append_options (args, t, c_poptions); append_options (args, t, x_poptions); + append_options (args, t, c_poptions); append_lib_options (t.base_scope (), args, a, t, li); @@ -5681,8 +5681,13 @@ namespace build2 // if (md.pp != preprocessed::all) { - append_options (args, t, c_poptions); + // Note that these come in the reverse order of coptions since the + // header search paths are examined in the order specified (in + // contrast to the "last value wins" semantics that we assume for + // coptions). + // append_options (args, t, x_poptions); + append_options (args, t, c_poptions); // Add *.export.poptions from prerequisite libraries. // |