mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
rust_1_42: drop
Nothing seems to need this to build any more.
This commit is contained in:
parent
1f9cd4cf0a
commit
204d583573
@ -1,52 +0,0 @@
|
||||
From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001
|
||||
From: John Ericson <John.Ericson@Obsidian.Systems>
|
||||
Date: Sat, 22 Feb 2020 14:38:38 -0500
|
||||
Subject: [PATCH] Allow getting `no_std` from the config file
|
||||
|
||||
Currently, it is only set correctly in the sanity checking implicit
|
||||
default fallback code. Having a config file at all will for force
|
||||
`no_std = false`.
|
||||
---
|
||||
src/bootstrap/config.rs | 3 +++
|
||||
src/bootstrap/sanity.rs | 4 +---
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
|
||||
index 110c8b844d5..83a6934d477 100644
|
||||
--- a/src/bootstrap/config.rs
|
||||
+++ b/src/bootstrap/config.rs
|
||||
@@ -350,6 +350,7 @@ struct TomlTarget {
|
||||
musl_root: Option<String>,
|
||||
wasi_root: Option<String>,
|
||||
qemu_rootfs: Option<String>,
|
||||
+ no_std: Option<bool>,
|
||||
}
|
||||
|
||||
impl Config {
|
||||
@@ -610,6 +611,8 @@ impl Config {
|
||||
target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
|
||||
target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from);
|
||||
target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
|
||||
+ target.no_std
|
||||
+ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx"));
|
||||
|
||||
config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
|
||||
}
|
||||
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
|
||||
index 8ff7056e628..76e721ed8e3 100644
|
||||
--- a/src/bootstrap/sanity.rs
|
||||
+++ b/src/bootstrap/sanity.rs
|
||||
@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) {
|
||||
|
||||
if target.contains("-none-") || target.contains("nvptx") {
|
||||
if build.no_std(*target).is_none() {
|
||||
- let target = build.config.target_config.entry(target.clone()).or_default();
|
||||
-
|
||||
- target.no_std = true;
|
||||
+ build.config.target_config.entry(target.clone()).or_default();
|
||||
}
|
||||
|
||||
if build.no_std(*target) == Some(false) {
|
||||
--
|
||||
2.24.1
|
||||
|
@ -1,44 +0,0 @@
|
||||
# New rust versions should first go to staging.
|
||||
# Things to check after updating:
|
||||
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
|
||||
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
|
||||
# This testing can be also done by other volunteers as part of the pull
|
||||
# request review, in case platforms cannot be covered.
|
||||
# 2. The LLVM version used for building should match with rust upstream.
|
||||
# 3. Firefox and Thunderbird should still build on x86_64-linux.
|
||||
|
||||
{ stdenv, lib
|
||||
, buildPackages
|
||||
, newScope, callPackage
|
||||
, CoreFoundation, Security
|
||||
, llvmPackages_5
|
||||
, pkgsBuildTarget, pkgsBuildBuild
|
||||
} @ args:
|
||||
|
||||
import ./default.nix {
|
||||
rustcVersion = "1.42.0";
|
||||
rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j";
|
||||
|
||||
# Note: the version MUST be one version prior to the version we're
|
||||
# building
|
||||
bootstrapVersion = "1.41.0";
|
||||
|
||||
# fetch hashes by running `print-hashes.sh 1.42.0`
|
||||
bootstrapHashes = {
|
||||
i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897";
|
||||
x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b";
|
||||
arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047";
|
||||
armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be";
|
||||
aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27";
|
||||
i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339";
|
||||
x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a";
|
||||
};
|
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_42;
|
||||
|
||||
rustcPatches = [
|
||||
./0001-Allow-getting-no_std-from-the-config-file.patch
|
||||
];
|
||||
}
|
||||
|
||||
(builtins.removeAttrs args [ "fetchpatch" ])
|
@ -9199,15 +9199,11 @@ in
|
||||
inherit (darwin) apple_sdk;
|
||||
};
|
||||
|
||||
rust_1_42 = callPackage ../development/compilers/rust/1_42.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
rust_1_44 = callPackage ../development/compilers/rust/1_44.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
rust = rust_1_44;
|
||||
|
||||
rustPackages_1_42 = rust_1_42.packages.stable;
|
||||
rustPackages_1_44 = rust_1_44.packages.stable;
|
||||
rustPackages = rustPackages_1_44;
|
||||
|
||||
@ -22550,7 +22546,6 @@ in
|
||||
thonny = callPackage ../applications/editors/thonny { };
|
||||
|
||||
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
|
||||
inherit (rustPackages_1_42) rustc;
|
||||
libpng = libpng_apng;
|
||||
gtk3Support = true;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user