diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-30 00:02:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 00:02:29 +0000 |
| commit | f11307e4b2905a221a6dce05f9edbc239e9b244b (patch) | |
| tree | 745ce3a1c1734f1763e30106363ab970358cd7fb /pkgs/stdenv | |
| parent | 8e6c107381bd2ff2a36e365e8c3c0657c07d7119 (diff) | |
| parent | 941a6593c83b9de20357ca557d5b6cf963faa03e (diff) | |
| download | nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.tar nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.tar.gz nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.tar.bz2 nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.tar.lz nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.tar.xz nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.tar.zst nixlib-f11307e4b2905a221a6dce05f9edbc239e9b244b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2c74f7722d3..b2b0dad82d82 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -279,6 +279,10 @@ in }; }; }; + + # `libtool` comes with obsolete config.sub/config.guess that don't recognize Risc-V. + extraNativeBuildInputs = + lib.optional (localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook; }) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 0eee6e692fd3..84b63e7b8fd0 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -160,6 +160,11 @@ in with pkgs; rec { # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib + '' + lib.optionalString (stdenv.hostPlatform.isRiscV) '' + # libatomic is required on RiscV platform for C/C++ atomics and pthread + # even though they may be translated into native instructions. + cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib + '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib |