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).

1 files changed, 5 insertions, 4 deletions

diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index d24eb02..2ac8c0b 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -38,7 +38,7 @@ namespace build2
     //
     // Note that the order of processing is:
     //
-    // 1. options
+    // 1. options (x.* then cc.* to be consistent with poptions/loptions)
     // 2. lib itself (if self is true)
     // 3. dependency libs (prerequisite_targets, left to right, depth-first)
     // 4. dependency libs (*.libs variables).
@@ -141,24 +141,25 @@ namespace build2
                 // perhaps we can assume non-common values will be set on
                 // libs{}/liba{}.
                 //
-                proc_opt (l, *t, true, true);
                 proc_opt (l, *t, false, true);
+                proc_opt (l, *t, true, true);
+
               }
               else
               {
                 // For default export we use the same options as were used to
                 // build the library.
                 //
-                proc_opt (l, *t, true, false);
                 proc_opt (l, *t, false, false);
+                proc_opt (l, *t, true, false);
               }
             }
             else
             {
               // Interface: only add *.export.* (interface dependencies).
               //
-              proc_opt (l, *t, true, true);
               proc_opt (l, *t, false, true);
+              proc_opt (l, *t, true, true);
             }
           }
         }