forked from kiss-community/repo
185 lines
7.7 KiB
Diff
185 lines
7.7 KiB
Diff
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
|
|
index 4cd793ada..562cf3e05 100644
|
|
--- a/src/bootstrap/compile.rs
|
|
+++ b/src/bootstrap/compile.rs
|
|
@@ -115,28 +115,6 @@ impl Step for Std {
|
|
fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned<String>) {
|
|
let libdir = builder.sysroot_libdir(*compiler, target);
|
|
|
|
- // Copies the crt(1,i,n).o startup objects
|
|
- //
|
|
- // Since musl supports fully static linking, we can cross link for it even
|
|
- // with a glibc-targeting toolchain, given we have the appropriate startup
|
|
- // files. As those shipped with glibc won't work, copy the ones provided by
|
|
- // musl so we have them on linux-gnu hosts.
|
|
- if target.contains("musl") {
|
|
- for &obj in &["crt1.o", "crti.o", "crtn.o"] {
|
|
- builder.copy(
|
|
- &builder.musl_root(target).unwrap().join("lib").join(obj),
|
|
- &libdir.join(obj),
|
|
- );
|
|
- }
|
|
- } else if target.ends_with("-wasi") {
|
|
- for &obj in &["crt1.o"] {
|
|
- builder.copy(
|
|
- &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj),
|
|
- &libdir.join(obj),
|
|
- );
|
|
- }
|
|
- }
|
|
-
|
|
// Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx.
|
|
//
|
|
// This target needs to be linked to Fortanix's port of llvm's libunwind.
|
|
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
|
|
index 4e3930c8d..3b1095480 100644
|
|
--- a/src/bootstrap/sanity.rs
|
|
+++ b/src/bootstrap/sanity.rs
|
|
@@ -187,34 +187,6 @@ pub fn check(build: &mut Build) {
|
|
}
|
|
}
|
|
|
|
- // Make sure musl-root is valid
|
|
- if target.contains("musl") {
|
|
- // If this is a native target (host is also musl) and no musl-root is given,
|
|
- // fall back to the system toolchain in /usr before giving up
|
|
- if build.musl_root(*target).is_none() && build.config.build == *target {
|
|
- let target = build.config.target_config.entry(target.clone())
|
|
- .or_default();
|
|
- target.musl_root = Some("/usr".into());
|
|
- }
|
|
- match build.musl_root(*target) {
|
|
- Some(root) => {
|
|
- if fs::metadata(root.join("lib/libc.a")).is_err() {
|
|
- panic!("couldn't find libc.a in musl dir: {}",
|
|
- root.join("lib").display());
|
|
- }
|
|
- if fs::metadata(root.join("lib/libunwind.a")).is_err() {
|
|
- panic!("couldn't find libunwind.a in musl dir: {}",
|
|
- root.join("lib").display());
|
|
- }
|
|
- }
|
|
- None => {
|
|
- panic!("when targeting MUSL either the rust.musl-root \
|
|
- option or the target.$TARGET.musl-root option must \
|
|
- be specified in config.toml")
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
if target.contains("msvc") {
|
|
// There are three builds of cmake on windows: MSVC, MinGW, and
|
|
// Cygwin. The Cygwin build does not have generators for Visual
|
|
diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
|
|
index e294e6398..17fecb3b2 100644
|
|
--- a/src/librustc_target/spec/linux_musl_base.rs
|
|
+++ b/src/librustc_target/spec/linux_musl_base.rs
|
|
@@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions {
|
|
base.post_link_objects_crt.push("crtn.o".to_string());
|
|
|
|
// These targets statically link libc by default
|
|
- base.crt_static_default = true;
|
|
+ base.crt_static_default = false;
|
|
// These targets allow the user to choose between static and dynamic linking.
|
|
base.crt_static_respected = true;
|
|
|
|
diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
|
|
index da31a49dd..dd0b89227 100644
|
|
--- a/src/libunwind/build.rs
|
|
+++ b/src/libunwind/build.rs
|
|
@@ -13,9 +13,7 @@ fn main() {
|
|
#[cfg(all(not(bootstrap), feature = "llvm-libunwind"))]
|
|
llvm_libunwind::compile();
|
|
} else if target.contains("linux") {
|
|
- if target.contains("musl") {
|
|
- // musl is handled in lib.rs
|
|
- } else if !target.contains("android") {
|
|
+ if !target.contains("android") {
|
|
println!("cargo:rustc-link-lib=gcc_s");
|
|
}
|
|
} else if target.contains("freebsd") {
|
|
diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
|
|
index 8d9164471..9a6411c60 100644
|
|
--- a/src/libunwind/lib.rs
|
|
+++ b/src/libunwind/lib.rs
|
|
@@ -20,11 +20,6 @@ cfg_if::cfg_if! {
|
|
}
|
|
}
|
|
|
|
-#[cfg(target_env = "musl")]
|
|
-#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
|
|
-#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
|
|
-extern {}
|
|
-
|
|
#[cfg(target_os = "redox")]
|
|
#[link(name = "gcc_eh", kind = "static-nobundle", cfg(target_feature = "crt-static"))]
|
|
#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
|
|
diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
|
|
index 8295dfc02..c1740ff5d 100644
|
|
--- a/vendor/libc/src/unix/mod.rs
|
|
+++ b/vendor/libc/src/unix/mod.rs
|
|
@@ -296,13 +296,6 @@ cfg_if! {
|
|
} else if #[cfg(feature = "std")] {
|
|
// cargo build, don't pull in anything extra as the libstd dep
|
|
// already pulls in all libs.
|
|
- } else if #[cfg(target_env = "musl")] {
|
|
- #[cfg_attr(feature = "rustc-dep-of-std",
|
|
- link(name = "c", kind = "static",
|
|
- cfg(target_feature = "crt-static")))]
|
|
- #[cfg_attr(feature = "rustc-dep-of-std",
|
|
- link(name = "c", cfg(not(target_feature = "crt-static"))))]
|
|
- extern {}
|
|
} else if #[cfg(target_os = "emscripten")] {
|
|
#[link(name = "c")]
|
|
extern {}
|
|
diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
|
|
index 02b93b90a..ff66ca180 100644
|
|
--- a/vendor/openssl-sys/build/main.rs
|
|
+++ b/vendor/openssl-sys/build/main.rs
|
|
@@ -183,27 +183,30 @@ See rust-openssl README for more information:
|
|
if let Some(libressl_version) = libressl_version {
|
|
println!("cargo:libressl_version_number={:x}", libressl_version);
|
|
|
|
+ let major = (libressl_version >> 28) as u8;
|
|
let minor = (libressl_version >> 20) as u8;
|
|
let fix = (libressl_version >> 12) as u8;
|
|
- let (minor, fix) = match (minor, fix) {
|
|
- (5, 0) => ('5', '0'),
|
|
- (5, 1) => ('5', '1'),
|
|
- (5, 2) => ('5', '2'),
|
|
- (5, _) => ('5', 'x'),
|
|
- (6, 0) => ('6', '0'),
|
|
- (6, 1) => ('6', '1'),
|
|
- (6, 2) => ('6', '2'),
|
|
- (6, _) => ('6', 'x'),
|
|
- (7, _) => ('7', 'x'),
|
|
- (8, 0) => ('8', '0'),
|
|
- (8, 1) => ('8', '1'),
|
|
- (8, _) => ('8', 'x'),
|
|
- (9, 0) => ('9', '0'),
|
|
+ let (major, minor, fix) = match (major, minor, fix) {
|
|
+ (2, 5, 0) => ('2', '5', '0'),
|
|
+ (2, 5, 1) => ('2', '5', '1'),
|
|
+ (2, 5, 2) => ('2', '5', '2'),
|
|
+ (2, 5, _) => ('2', '5', 'x'),
|
|
+ (2, 6, 0) => ('2', '6', '0'),
|
|
+ (2, 6, 1) => ('2', '6', '1'),
|
|
+ (2, 6, 2) => ('2', '6', '2'),
|
|
+ (2, 6, _) => ('2', '6', 'x'),
|
|
+ (2, 7, _) => ('2', '7', 'x'),
|
|
+ (2, 8, 0) => ('2', '8', '0'),
|
|
+ (2, 8, 1) => ('2', '8', '1'),
|
|
+ (2, 8, _) => ('2', '8', 'x'),
|
|
+ (2, 9, 0) => ('2', '9', '0'),
|
|
+ (2, 9, _) => ('2', '9', 'x'),
|
|
+ (3, 0, 0) => ('3', '0', '0'),
|
|
_ => version_error(),
|
|
};
|
|
|
|
println!("cargo:libressl=true");
|
|
- println!("cargo:libressl_version=2{}{}", minor, fix);
|
|
+ println!("cargo:libressl_version={}{}{}", major, minor, fix);
|
|
println!("cargo:version=101");
|
|
Version::Libressl
|
|
} else {
|