aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xextra/rust/build63
-rw-r--r--extra/rust/checksums5
-rw-r--r--extra/rust/depends7
-rw-r--r--extra/rust/patches/musl.patch82
-rw-r--r--extra/rust/sources5
-rw-r--r--extra/rust/version1
6 files changed, 0 insertions, 163 deletions
diff --git a/extra/rust/build b/extra/rust/build
deleted file mode 100755
index fa5c547c..00000000
--- a/extra/rust/build
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh -e
-
-patch -p1 < musl.patch
-
-# This package mimics the download process of rust's 'x.py'
-# bootstrap library to allow for the removal of the internet
-# connection requirement per build.
-{
- mkdir -p "${cache_dir:=build/cache/2020-02-27}"
-
- for tarball in *.tar.xz\?no-extract; do
- mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
- done
-}
-
-# 'rust' checksums files in 'vendor/', but we patch a few.
-for vendor in libc openssl-sys; do
- sed -i 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json"
-done
-
-cat > config.toml <<EOF
-[llvm]
-link-shared = true
-
-[build]
-build = "x86_64-unknown-linux-musl"
-host = [ "x86_64-unknown-linux-musl" ]
-target = [ "x86_64-unknown-linux-musl" ]
-
-docs = false
-compiler-docs = false
-extended = true
-submodules = false
-python = "python3"
-locked-deps = true
-vendor = true
-sanitizers = false
-profiler = false
-full-bootstrap = false
-
-[install]
-prefix = "/usr"
-
-[rust]
-channel = "stable"
-rpath = false
-codegen-units = 1
-debuginfo-level = 0
-debug = false
-backtrace = false
-jemalloc = false
-debug-assertions = false
-codegen-tests = false
-
-[target.x86_64-unknown-linux-musl]
-llvm-config = "/usr/bin/llvm-config"
-crt-static = false
-EOF
-
-export DESTDIR="$1"
-
-python3 ./x.py build -j "$(nproc)"
-python3 ./x.py install
diff --git a/extra/rust/checksums b/extra/rust/checksums
deleted file mode 100644
index 47ac6e98..00000000
--- a/extra/rust/checksums
+++ /dev/null
@@ -1,5 +0,0 @@
-aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04 rustc-1.42.0-src.tar.xz
-82b2ce7da86132beeab1a00e52c3a748d52206af4cdd82de6586b13e819ceba7 rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
-af9b1797ce5ae20bceabc3e5e67a9aca507bcfca3100d916783bd82273924d46 rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
-4f36ad854709cfaa85bf98d05cb9ecbcc2ee3a2698af99bfff0e04cd941bea56 cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f musl.patch
diff --git a/extra/rust/depends b/extra/rust/depends
deleted file mode 100644
index 058f23c8..00000000
--- a/extra/rust/depends
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake make
-curl make
-libressl
-llvm
-python make
-xz
-zlib
diff --git a/extra/rust/patches/musl.patch b/extra/rust/patches/musl.patch
deleted file mode 100644
index 04c246ca..00000000
--- a/extra/rust/patches/musl.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index eced035..f988315 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -132,7 +132,7 @@ fn copy_third_party_objects(
- // 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") {
-+ if target.contains("noop") {
- let srcdir = builder.musl_root(target).unwrap().join("lib");
- for &obj in &["crt1.o", "crti.o", "crtn.o"] {
- copy_and_stamp(&srcdir, obj);
-diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
-index 8ff7056..53c0194 100644
---- a/src/bootstrap/sanity.rs
-+++ b/src/bootstrap/sanity.rs
-@@ -205,7 +205,7 @@ pub fn check(build: &mut Build) {
- }
-
- // Make sure musl-root is valid
-- if target.contains("musl") {
-+ if target.contains("noop") {
- // 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 {
-diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
-index e294e63..17fecb3 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 a24808b..25300a5 100644
---- a/src/libunwind/build.rs
-+++ b/src/libunwind/build.rs
-@@ -10,7 +10,7 @@ fn main() {
- // Build the unwinding from libunwind C/C++ source code.
- llvm_libunwind::compile();
- } else if target.contains("linux") {
-- if target.contains("musl") {
-+ if target.contains("noop") {
- // linking for musl is handled in lib.rs
- llvm_libunwind::compile();
- } else if !target.contains("android") {
-
-diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
-index 18d41be..6fddd6d 100644
---- a/src/libunwind/lib.rs
-+++ b/src/libunwind/lib.rs
-@@ -18,7 +18,7 @@ cfg_if::cfg_if! {
- }
- }
-
--#[cfg(target_env = "musl")]
-+#[cfg(target_env = "noop")]
- #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
- #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
- extern "C" {}
-
-diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
-index 238da24..71d4f31 100644
---- a/vendor/libc/src/unix/mod.rs
-+++ b/vendor/libc/src/unix/mod.rs
-@@ -298,7 +298,7 @@ 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")] {
-+ } else if #[cfg(target_env = "noop")] {
- #[cfg_attr(feature = "rustc-dep-of-std",
- link(name = "c", kind = "static",
- cfg(target_feature = "crt-static")))]
-
diff --git a/extra/rust/sources b/extra/rust/sources
deleted file mode 100644
index f1a68ebc..00000000
--- a/extra/rust/sources
+++ /dev/null
@@ -1,5 +0,0 @@
-https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz
-https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-patches/musl.patch
diff --git a/extra/rust/version b/extra/rust/version
deleted file mode 100644
index 4c2e665d..00000000
--- a/extra/rust/version
+++ /dev/null
@@ -1 +0,0 @@
-1.42.0 1