Fix SDKROOT ignore on macOS

madsmtm · madsmtm · commit 56844c797ad6 · 2024-09-14T04:28:38.000+02:00
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -3044,7 +3044,7 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, errors::AppleSdkRootErro
             "iphonesimulator"
                 if sdkroot.contains("iPhoneOS.platform") || sdkroot.contains("MacOSX.platform") => {
             }
-            "macosx10.15"
+            "macosx"
                 if sdkroot.contains("iPhoneOS.platform")
                     || sdkroot.contains("iPhoneSimulator.platform") => {}
             "watchos"

Original file line number	Diff line number	Diff line change
`@@ -3044,7 +3044,7 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, errors::AppleSdkRootErro`
`3044`	`3044`	`"iphonesimulator"`
`3045`	`3045`	`if sdkroot.contains("iPhoneOS.platform") \|\| sdkroot.contains("MacOSX.platform") => {`
`3046`	`3046`	`}`
`3047`		`- "macosx10.15"`
	`3047`	`+ "macosx"`
`3048`	`3048`	`if sdkroot.contains("iPhoneOS.platform")`
`3049`	`3049`	`\|\| sdkroot.contains("iPhoneSimulator.platform") => {}`
`3050`	`3050`	`"watchos"`