40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs
|
|
index 2ab4c71b59..6bcf003c0a 100644
|
|
--- a/apple-catalog-parsing/build.rs
|
|
+++ b/apple-catalog-parsing/build.rs
|
|
@@ -30,7 +30,7 @@
|
|
// Add necessary libraries to the linker search path. Without this line, compiling fails
|
|
// on systems without Xcode installed (xcode-select is still required).
|
|
println!(
|
|
- "cargo:rustc-link-search=native=/Library/Developer/CommandLineTools/usr/lib/swift/macosx"
|
|
+ "cargo:rustc-link-search=native=/usr/lib/swift/macosx"
|
|
);
|
|
|
|
let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts");
|
|
@@ -87,17 +87,14 @@
|
|
println!("cargo:rustc-link-search=framework=/System/Library/PrivateFrameworks");
|
|
println!("cargo:rustc-link-lib=framework=CoreUI");
|
|
|
|
- // Link to swift macOS support libraries for Swift runtime support on older macOS versions
|
|
- let developer_dir = Command::new("xcode-select")
|
|
- .args(["-p"])
|
|
- .output()
|
|
- .expect("Failed to get developer directory, please ensure Xcode is installed.");
|
|
- let developer_dir_path = String::from_utf8(developer_dir.stdout)
|
|
- .expect("Failed to convert developer directory to UTF-8")
|
|
- .trim()
|
|
- .to_owned();
|
|
-
|
|
- println!(
|
|
- "cargo:rustc-link-search={developer_dir_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx"
|
|
+ // Link libobjc to avoid the following error: ld: can't find ordinal for imported symbol '___objc_personality_v0'
|
|
+ println!("cargo:rustc-link-lib=objc");
|
|
+
|
|
+ println!(
|
|
+ "cargo:rustc-link-search=/usr/lib/swift"
|
|
+ );
|
|
+
|
|
+ println!(
|
|
+ "cargo:rustc-link-search=@swiftLib@/lib/swift/macosx"
|
|
);
|
|
}
|