Make user-specified cflags take precedence over cc-rs flags

madsmtm · madsmtm · commit 836acf7ddecc · 2025-02-10T10:26:55.000+01:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -724,14 +724,14 @@ impl Config {
                     let mut flagsflag = OsString::from("-D");
                     flagsflag.push(&flag_var);
                     flagsflag.push("=");
-                    flagsflag.push(extra);
                     for arg in compiler.args() {
                         if skip_arg(arg) {
                             continue;
                         }
-                        flagsflag.push(" ");
                         flagsflag.push(arg);
+                        flagsflag.push(" ");
                     }
+                    flagsflag.push(extra);
                     cmd.arg(flagsflag);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -724,14 +724,14 @@ impl Config {`
`724`	`724`	`let mut flagsflag = OsString::from("-D");`
`725`	`725`	`flagsflag.push(&flag_var);`
`726`	`726`	`flagsflag.push("=");`
`727`		`- flagsflag.push(extra);`
`728`	`727`	`for arg in compiler.args() {`
`729`	`728`	`if skip_arg(arg) {`
`730`	`729`	`continue;`
`731`	`730`	`}`
`732`		`- flagsflag.push(" ");`
`733`	`731`	`flagsflag.push(arg);`
	`732`	`+ flagsflag.push(" ");`
`734`	`733`	`}`
	`734`	`+ flagsflag.push(extra);`
`735`	`735`	`cmd.arg(flagsflag);`
`736`	`736`	`}`
`737`	`737`