Output clang args after '--'

For command_line_flags(), some arguments (like '--no-record-matches')
were added after '--'. The bindgen program would interpret these as
clang args.

1 files changed, 16 insertions, 14 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 8a8b4e4a..05d7ea3e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -593,20 +593,6 @@ impl Builder {
             })
             .count();
 
-        output_vector.push("--".into());
-
-        if !self.options.clang_args.is_empty() {
-            output_vector.extend(self.options.clang_args.iter().cloned());
-        }
-
-        if self.input_headers.len() > 1 {
-            output_vector.extend(
-                self.input_headers[..self.input_headers.len() - 1]
-                    .iter()
-                    .cloned(),
-            );
-        }
-
         if !self.options.record_matches {
             output_vector.push("--no-record-matches".into());
         }
@@ -659,6 +645,22 @@ impl Builder {
             })
             .count();
 
+        // Add clang arguments
+
+        output_vector.push("--".into());
+
+        if !self.options.clang_args.is_empty() {
+            output_vector.extend(self.options.clang_args.iter().cloned());
+        }
+
+        if self.input_headers.len() > 1 {
+            output_vector.extend(
+                self.input_headers[..self.input_headers.len() - 1]
+                    .iter()
+                    .cloned(),
+            );
+        }
+
         output_vector
     }