Browse Source

Remove mimalloc to fix iOS linking

pull/247/head
ssrlive 1 month ago
parent
commit
a3b03601ef
  1. 1
      Cargo.toml
  2. 2
      build-aarch64-apple-ios-debug.sh
  3. 2
      build-aarch64-apple-ios.sh
  4. 2
      build-apple.sh
  5. 4
      src/lib.rs

1
Cargo.toml

@ -40,7 +40,6 @@ hickory-proto = "0.26.0"
httparse = "1.10.1" httparse = "1.10.1"
ipstack = { version = "1.0.0" } ipstack = { version = "1.0.0" }
log = { version = "0.4.29", features = ["std"] } log = { version = "0.4.29", features = ["std"] }
mimalloc = { version = "0.1.50", default-features = false, optional = true }
percent-encoding = "2.3.2" percent-encoding = "2.3.2"
serde = { version = "1.0.228", features = ["derive"] } serde = { version = "1.0.228", features = ["derive"] }
shlex = "1.3.0" shlex = "1.3.0"

2
build-aarch64-apple-ios-debug.sh

@ -5,7 +5,7 @@ rustup target add aarch64-apple-ios
cargo install cbindgen cargo install cbindgen
echo "Building target aarch64-apple-ios..." echo "Building target aarch64-apple-ios..."
cargo build --target aarch64-apple-ios --features mimalloc cargo build --target aarch64-apple-ios
echo "Generating includes..." echo "Generating includes..."
mkdir -p target/include/ mkdir -p target/include/

2
build-aarch64-apple-ios.sh

@ -5,7 +5,7 @@ rustup target add aarch64-apple-ios
cargo install cbindgen cargo install cbindgen
echo "Building target aarch64-apple-ios..." echo "Building target aarch64-apple-ios..."
cargo build --release --target aarch64-apple-ios --features mimalloc cargo build --release --target aarch64-apple-ios
echo "Generating includes..." echo "Generating includes..."
mkdir -p target/include/ mkdir -p target/include/

2
build-apple.sh

@ -13,7 +13,7 @@ echo "cargo build --release --target aarch64-apple-darwin"
cargo build --release --target aarch64-apple-darwin cargo build --release --target aarch64-apple-darwin
echo "cargo build --release --target aarch64-apple-ios" echo "cargo build --release --target aarch64-apple-ios"
cargo build --release --target aarch64-apple-ios --features mimalloc cargo build --release --target aarch64-apple-ios
echo "cargo build --release --target x86_64-apple-ios" echo "cargo build --release --target x86_64-apple-ios"
cargo build --release --target x86_64-apple-ios cargo build --release --target x86_64-apple-ios

4
src/lib.rs

@ -38,10 +38,6 @@ pub use {
traffic_status::{TrafficStatus, tun2proxy_set_traffic_status_callback}, traffic_status::{TrafficStatus, tun2proxy_set_traffic_status_callback},
}; };
#[cfg(feature = "mimalloc")]
#[global_allocator]
static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
pub use general_api::general_run_async; pub use general_api::general_run_async;
pub const FORCE_EXIT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(2); pub const FORCE_EXIT_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(2);

Loading…
Cancel
Save