bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Update Cargo, build curl/OpenSSL statically via features

Browse source 
In addition to to updating Cargo's submodule and Cargo's dependencies,
this also updates Cargo's build to build OpenSSL statically into Cargo
as well as libcurl unconditionally. This removes OpenSSL build logic
from the bootstrap code, and otherwise requests that even on OSX we
build curl statically.
This commit is contained in:
Alex Crichton 2018-10-08 10:39:09 -07:00
parent d5418764ad
commit 4f661c016f
19 changed files with 285 additions and 435 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/configure.py
View file

@ -64,7 +64,7 @@ o("locked-deps", "build.locked-deps", "force Cargo.lock to be up to date")
o("vendor", "build.vendor", "enable usage of vendored Rust crates")
o("sanitizers", "build.sanitizers", "build the sanitizer runtimes (asan, lsan, msan, tsan)")
o("dist-src", "rust.dist-src", "when building tarballs enables building a source tarball")
o("cargo-openssl-static", "build.openssl-static", "static openssl in cargo")
o("cargo-native-static", "build.cargo-native-static", "static native libraries in cargo")
o("profiler", "build.profiler", "build the profiler runtime")
o("emscripten", None, "compile the emscripten backend as well as LLVM")
o("full-tools", None, "enable all tools")