Go from xargo to using cargo with build-std

Author: terhechte

Cargo.toml

@@ -19,7 +19,9 @@ twox-hash = "1.5.0"
 foreign-types = "*"
 libc = "*"
 
+[profile.dev]
+panic = 'unwind'
 
 [profile.release]
-panic = "abort"
+panic = 'unwind'
 

Xargo.toml

@@ -1,6 +1,11 @@
 #!/bin/bash
 
+# We need the SDK Root
+export SDKROOT=`xcrun --sdk macosx --show-sdk-path`
+
 # lipo together the different architectures into a universal 'fat' file
-xargo build --target x86_64-apple-ios-macabi --release
-xargo build --target aarch64-apple-ios --release
+# use `cargo build-std` to automatically build the std for non-tier1 platforms
+# such as catalyst
+cargo +nightly build -Z build-std --target x86_64-apple-ios-macabi --release
+cargo build --target aarch64-apple-ios --release
 lipo -create -output target/libtest1.a target/{aarch64-apple-ios,x86_64-apple-ios-macabi}/release/libtest1.a