run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS

jieyouxu · jieyouxu · commit 42ecde4e5f1b · 2024-05-02T01:08:39.000Z
diff --git a/src/tools/run-make-support/src/cc.rs b/src/tools/run-make-support/src/cc.rs
@@ -161,8 +161,9 @@ pub fn extra_cxx_flags() -> Vec<&'static str> {
     if is_windows() {
         if is_msvc() { vec![] } else { vec!["-lstdc++"] }
     } else {
-        match uname() {
-            n if n.contains("Darwin") => vec!["-lc++"],
+        match &uname()[..] {
+            "Darwin" => vec!["-lc++"],
+            "FreeBSD" | "SunOS" | "OpenBSD" => vec![],
             _ => vec!["-lstdc++"],
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,9 @@ pub fn extra_cxx_flags() -> Vec<&'static str> {`
`161`	`161`	`if is_windows() {`
`162`	`162`	`if is_msvc() { vec![] } else { vec!["-lstdc++"] }`
`163`	`163`	`} else {`
`164`		`- match uname() {`
`165`		`- n if n.contains("Darwin") => vec!["-lc++"],`
	`164`	`+ match &uname()[..] {`
	`165`	`+ "Darwin" => vec!["-lc++"],`
	`166`	`+ "FreeBSD" \| "SunOS" \| "OpenBSD" => vec![],`
`166`	`167`	`_ => vec!["-lstdc++"],`
`167`	`168`	`}`
`168`	`169`	`}`