mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
53b6e1a3c5
Our `rustc.nix` adds a `--target` flag for the host when doing a host!=target build, but neglects to add a `--target` flag for the buildPlatform when doing a build!=(host==target) build. This commit corrects that. Before rustc 1.68 omitting the --target flag for the buildPlatform did not cause any problems. As of rustc 1.68, build!=host without a --target for the build will fail like below (with hundreds more "cannot find std::" errors. ``` $ nix build -f . -L pkgsCross.aarch64-multiplatform.rustc ... Copying stage1 library from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / aarch64-unknown-linux-gnu) Uplifting stage1 library (x86_64-unknown-linux-gnu -> aarch64-unknown-linux-gnu) Copying stage2 library from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / aarch64-unknown-linux-gnu) Building stage2 tool rust-analyzer-proc-macro-srv (aarch64-unknown-linux-gnu) Compiling autocfg v1.1.0 Compiling libc v0.2.135 Compiling cfg-if v1.0.0 Compiling proc-macro2 v1.0.47 Compiling quote v1.0.21 Compiling unicode-ident v1.0.5 Compiling syn v1.0.102 Compiling once_cell v1.15.0 Compiling parking_lot_core v0.9.4 Compiling serde_derive v1.0.145 Compiling hashbrown v0.12.3 Compiling scopeguard v1.1.0 Compiling smallvec v1.10.0 Compiling log v0.4.17 Compiling serde v1.0.145 Compiling rustc-hash v1.1.0 error[E0463]: can't find crate for `std` error: cannot find macro `println` in this scope --> /nix/tmp/nix-build-rustc-aarch64-unknown-linux-gnu-1.68.2.drv-0/rustc-1.68.2-src/vendor/libc-0.2.135/build.rs:7:5 | 7 | println!("cargo:rerun-if-changed=build.rs"); | ^^^^^^^ error: cannot find macro `println` in this scope --> /nix/tmp/nix-build-rustc-aarch64-unknown-linux-gnu-1.68.2.drv-0/rustc-1.68.2-src/vendor/libc-0.2.135/build.rs:16:9 | 16 | println!( | ^^^^^^^ error: cannot find macro `println` in this scope --> /nix/tmp/nix-build-rustc-aarch64-unknown-linux-gnu-1.68.2.drv-0/rustc-1.68.2-src/vendor/libc-0.2.135/build.rs:29:13 | 29 | println!("cargo:rustc-cfg=freebsd10") | ^^^^^^^ ```
238 lines
9.3 KiB
Nix
238 lines
9.3 KiB
Nix
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
|
|
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
|
|
, fetchurl, file, python3
|
|
, darwin, cmake, rust, rustPlatform
|
|
, pkg-config, openssl, xz
|
|
, libiconv
|
|
, which, libffi
|
|
, withBundledLLVM ? false
|
|
, enableRustcDev ? true
|
|
, version
|
|
, sha256
|
|
, patches ? []
|
|
, fd
|
|
, ripgrep
|
|
, wezterm
|
|
, firefox
|
|
, thunderbird
|
|
}:
|
|
|
|
let
|
|
inherit (lib) optionals optional optionalString concatStringsSep;
|
|
inherit (darwin.apple_sdk.frameworks) Security;
|
|
in stdenv.mkDerivation rec {
|
|
pname = "rustc";
|
|
inherit version;
|
|
|
|
src = fetchurl {
|
|
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
|
|
inherit sha256;
|
|
};
|
|
|
|
__darwinAllowLocalNetworking = true;
|
|
|
|
# rustc complains about modified source files otherwise
|
|
dontUpdateAutotoolsGnuConfigScripts = true;
|
|
|
|
# Running the default `strip -S` command on Darwin corrupts the
|
|
# .rlib files in "lib/".
|
|
#
|
|
# See https://github.com/NixOS/nixpkgs/pull/34227
|
|
#
|
|
# Running `strip -S` when cross compiling can harm the cross rlibs.
|
|
# See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
|
|
stripDebugList = [ "bin" ];
|
|
|
|
# The Rust pkg-config crate does not support prefixed pkg-config executables[1],
|
|
# but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE}
|
|
# environment variables.
|
|
# [1]: https://github.com/rust-lang/pkg-config-rs/issues/53
|
|
"PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.buildPlatform)}" =
|
|
"${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config";
|
|
|
|
NIX_LDFLAGS = toString (
|
|
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
|
|
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
|
|
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
|
|
++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib");
|
|
|
|
# Increase codegen units to introduce parallelism within the compiler.
|
|
RUSTFLAGS = "-Ccodegen-units=10";
|
|
|
|
# We need rust to build rust. If we don't provide it, configure will try to download it.
|
|
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
|
|
configureFlags = let
|
|
setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}";
|
|
setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}";
|
|
setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}";
|
|
ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc";
|
|
cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++";
|
|
ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc";
|
|
cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++";
|
|
ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc";
|
|
cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++";
|
|
in [
|
|
"--release-channel=stable"
|
|
"--set=build.rustc=${rustPlatform.rust.rustc}/bin/rustc"
|
|
"--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo"
|
|
"--enable-rpath"
|
|
"--enable-vendor"
|
|
"--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
|
|
"--host=${rust.toRustTargetSpec stdenv.hostPlatform}"
|
|
# std is built for all platforms in --target.
|
|
"--target=${concatStringsSep "," ([
|
|
(rust.toRustTargetSpec stdenv.targetPlatform)
|
|
|
|
# (build!=target): When cross-building a compiler we need to add
|
|
# the build platform as well so rustc can compile build.rs
|
|
# scripts.
|
|
] ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform) [
|
|
(rust.toRustTargetSpec stdenv.buildPlatform)
|
|
|
|
# (host!=target): When building a cross-targeting compiler we
|
|
# need to add the host platform as well so rustc can compile
|
|
# build.rs scripts.
|
|
] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform) [
|
|
(rust.toRustTargetSpec stdenv.hostPlatform)
|
|
])}"
|
|
|
|
"${setBuild}.cc=${ccForBuild}"
|
|
"${setHost}.cc=${ccForHost}"
|
|
"${setTarget}.cc=${ccForTarget}"
|
|
|
|
"${setBuild}.linker=${ccForBuild}"
|
|
"${setHost}.linker=${ccForHost}"
|
|
"${setTarget}.linker=${ccForTarget}"
|
|
|
|
"${setBuild}.cxx=${cxxForBuild}"
|
|
"${setHost}.cxx=${cxxForHost}"
|
|
"${setTarget}.cxx=${cxxForTarget}"
|
|
|
|
"${setBuild}.crt-static=${lib.boolToString stdenv.buildPlatform.isStatic}"
|
|
"${setHost}.crt-static=${lib.boolToString stdenv.hostPlatform.isStatic}"
|
|
"${setTarget}.crt-static=${lib.boolToString stdenv.targetPlatform.isStatic}"
|
|
] ++ optionals (!withBundledLLVM) [
|
|
"--enable-llvm-link-shared"
|
|
"${setBuild}.llvm-config=${llvmSharedForBuild.dev}/bin/llvm-config"
|
|
"${setHost}.llvm-config=${llvmSharedForHost.dev}/bin/llvm-config"
|
|
"${setTarget}.llvm-config=${llvmSharedForTarget.dev}/bin/llvm-config"
|
|
] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [
|
|
"--enable-profiler" # build libprofiler_builtins
|
|
] ++ optionals stdenv.buildPlatform.isMusl [
|
|
"${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}"
|
|
] ++ optionals stdenv.hostPlatform.isMusl [
|
|
"${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}"
|
|
] ++ optionals stdenv.targetPlatform.isMusl [
|
|
"${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"
|
|
] ++ optionals (rust.IsNoStdTarget stdenv.targetPlatform) [
|
|
"--disable-docs"
|
|
] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
|
# https://github.com/rust-lang/rust/issues/92173
|
|
"--set rust.jemalloc"
|
|
];
|
|
|
|
# The bootstrap.py will generated a Makefile that then executes the build.
|
|
# The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
|
|
# to the bootstrap builder.
|
|
postConfigure = ''
|
|
substituteInPlace Makefile \
|
|
--replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)'
|
|
'';
|
|
|
|
# the rust build system complains that nix alters the checksums
|
|
dontFixLibtool = true;
|
|
|
|
inherit patches;
|
|
|
|
postPatch = ''
|
|
patchShebangs src/etc
|
|
|
|
${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
|
|
|
|
# Fix the configure script to not require curl as we won't use it
|
|
sed -i configure \
|
|
-e '/probe_need CFG_CURL curl/d'
|
|
|
|
# Useful debugging parameter
|
|
# export VERBOSE=1
|
|
'' + lib.optionalString (stdenv.targetPlatform.isMusl && !stdenv.targetPlatform.isStatic) ''
|
|
# Upstream rustc still assumes that musl = static[1]. The fix for
|
|
# this is to disable crt-static by default for non-static musl
|
|
# targets.
|
|
#
|
|
# Even though Cargo will build build.rs files for the build platform,
|
|
# cross-compiling _from_ musl appears to work fine, so we only need
|
|
# to do this when rustc's target platform is dynamically linked musl.
|
|
#
|
|
# [1]: https://github.com/rust-lang/compiler-team/issues/422
|
|
substituteInPlace compiler/rustc_target/src/spec/linux_musl_base.rs \
|
|
--replace "base.crt_static_default = true" "base.crt_static_default = false"
|
|
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
|
# See https://github.com/jemalloc/jemalloc/issues/1997
|
|
# Using a value of 48 should work on both emulated and native x86_64-darwin.
|
|
export JEMALLOC_SYS_WITH_LG_VADDR=48
|
|
'';
|
|
|
|
# rustc unfortunately needs cmake to compile llvm-rt but doesn't
|
|
# use it for the normal build. This disables cmake in Nix.
|
|
dontUseCmakeConfigure = true;
|
|
|
|
depsBuildBuild = [ pkgsBuildHost.stdenv.cc pkg-config ];
|
|
|
|
nativeBuildInputs = [
|
|
file python3 rustPlatform.rust.rustc cmake
|
|
which libffi removeReferencesTo pkg-config xz
|
|
];
|
|
|
|
buildInputs = [ openssl ]
|
|
++ optionals stdenv.isDarwin [ libiconv Security ]
|
|
++ optional (!withBundledLLVM) llvmShared;
|
|
|
|
outputs = [ "out" "man" "doc" ];
|
|
setOutputFlags = false;
|
|
|
|
postInstall = lib.optionalString enableRustcDev ''
|
|
# install rustc-dev components. Necessary to build rls, clippy...
|
|
python x.py dist rustc-dev
|
|
tar xf build/dist/rustc-dev*tar.gz
|
|
cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/
|
|
rm $out/lib/rustlib/install.log
|
|
for m in $out/lib/rustlib/manifest-rust*
|
|
do
|
|
sort --output=$m < $m
|
|
done
|
|
|
|
'' + ''
|
|
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
|
|
# and thus a transitive dependency on ncurses
|
|
find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
|
|
|
|
# remove uninstall script that doesn't really make sense for Nix.
|
|
rm $out/lib/rustlib/uninstall.sh
|
|
'';
|
|
|
|
configurePlatforms = [];
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
setupHooks = ./setup-hook.sh;
|
|
|
|
requiredSystemFeatures = [ "big-parallel" ];
|
|
|
|
passthru = {
|
|
llvm = llvmShared;
|
|
inherit llvmPackages;
|
|
tests = {
|
|
inherit fd ripgrep wezterm;
|
|
} // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit firefox thunderbird; };
|
|
};
|
|
|
|
meta = with lib; {
|
|
homepage = "https://www.rust-lang.org/";
|
|
description = "A safe, concurrent, practical language";
|
|
maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members;
|
|
license = [ licenses.mit licenses.asl20 ];
|
|
platforms = platforms.linux ++ platforms.darwin;
|
|
};
|
|
}
|