Fixed rust build
This commit is contained in:
parent
f2b55321fb
commit
dfdf3b3520
2 changed files with 17 additions and 6 deletions
|
@ -4,8 +4,8 @@
|
|||
base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
|
||||
|
||||
// These targets statically link libc by default
|
||||
- base.crt_static_default = false;
|
||||
+ base.crt_static_default = true;
|
||||
- base.crt_static_default = true;
|
||||
+ base.crt_static_default = false;
|
||||
|
||||
base
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- vendor/openssl-sys/Cargo.toml
|
||||
+++ ../../rust-1.49.0/vendor/openssl-sys/Cargo.toml
|
||||
--- a/vendor/openssl-sys/Cargo.toml
|
||||
+++ b/vendor/openssl-sys/Cargo.toml
|
||||
@@ -33,12 +33,11 @@
|
||||
|
||||
[build-dependencies.openssl-src]
|
||||
|
@ -15,8 +15,8 @@
|
|||
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
|
||||
version = "0.2.8"
|
||||
Only in ../../rust-1.49.0/vendor/openssl-sys: Cargo.toml.1
|
||||
--- vendor/openssl-sys/build/main.rs
|
||||
+++ ../../rust-1.49.0/vendor/openssl-sys/build/main.rs
|
||||
--- a/vendor/openssl-sys/build/main.rs
|
||||
+++ b/vendor/openssl-sys/build/main.rs
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
extern crate autocfg;
|
||||
|
@ -52,3 +52,14 @@ Only in ../../rust-1.49.0/vendor/openssl-sys: Cargo.toml.1
|
|||
}
|
||||
|
||||
fn main() {
|
||||
--- a/vendor/openssl-src/src/lib.rs
|
||||
+++ b/vendor/openssl-src/src/lib.rs
|
||||
@@ -58,7 +58,7 @@
|
||||
{
|
||||
Command::new("gmake")
|
||||
} else {
|
||||
- Command::new("make")
|
||||
+ Command::new("gmake")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue