Merge pull request #7 from polachok/flags

Allow user-specified flags override default
JohnTitor · Apr 15, 2016 · a6becb6 · a6becb6
2 parents 965d657 + ff477ba
commit a6becb6
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -559,10 +559,6 @@ impl TestGenerator {
         // Compile our C shim to be linked into tests
         let mut cfg = gcc::Config::new();
         cfg.file(&out.with_extension("c"));
-        for flag in self.flags.iter() {
-            cfg.flag(flag);
-        }
-
         if target.contains("msvc") {
             cfg.flag("/W3").flag("/Wall").flag("/WX")
                 // ignored warnings
@@ -578,6 +574,11 @@ impl TestGenerator {
                .flag("-Wno-unused-parameter")
                .flag("-Wno-type-limits");
         }
+
+        for flag in self.flags.iter() {
+            cfg.flag(flag);
+        }
+
         for &(ref a, ref b) in self.defines.iter() {
             cfg.define(a, b.as_ref().map(|s| &s[..]));
         }