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

madsmtm · madsmtm · commit 056a6ea325ee · 2025-01-27T02:21:39.000+01:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -726,14 +726,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
`@@ -726,14 +726,14 @@ impl Config {`
`726`	`726`	`let mut flagsflag = OsString::from("-D");`
`727`	`727`	`flagsflag.push(&flag_var);`
`728`	`728`	`flagsflag.push("=");`
`729`		`- flagsflag.push(extra);`
`730`	`729`	`for arg in compiler.args() {`
`731`	`730`	`if skip_arg(arg) {`
`732`	`731`	`continue;`
`733`	`732`	`}`
`734`		`- flagsflag.push(" ");`
`735`	`733`	`flagsflag.push(arg);`
	`734`	`+ flagsflag.push(" ");`
`736`	`735`	`}`
	`736`	`+ flagsflag.push(extra);`
`737`	`737`	`cmd.arg(flagsflag);`
`738`	`738`	`}`
`739`	`739`