diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-12-27 22:40:04 +0800 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-01-05 09:00:33 +0000 |
| commit | 37787a368d58f26730d3655d463481544e66f4f0 (patch) | |
| tree | a6391912f378f4f247682a5288946006f06eb8e5 | |
| parent | python3Packages.scikit-learn: fix compatibility with openblas 0.3.18 (diff) | |
| download | nixpkgs-origin/backport-153571-to-release-21.11.tar.gz | |
Export static libc, libm, libdl from the prebuilt crt as well.origin/backport-153571-to-release-21.11
Adds enable{Static,Shared} flags as well.
(cherry picked from commit cc545663cec6603e4c889c259a7f657e9f4229dc)
| -rw-r--r-- | pkgs/os-specific/linux/bionic-prebuilt/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index 920732a2020d..8fa17036c4ad 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -1,4 +1,6 @@ -{ stdenvNoCC, lib, fetchzip, pkgs +{ stdenv, stdenvNoCC, lib, fetchzip, pkgs +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic }: let @@ -92,10 +94,17 @@ stdenvNoCC.mkDerivation rec { cp -v ${prebuilt_crt.out}/*.o $out/lib/ cp -v ${prebuilt_crt.out}/libgcc.a $out/lib/ cp -v ${prebuilt_ndk_crt.out}/*.o $out/lib/ + '' + lib.optionalString enableShared '' for i in libc.so libm.so libdl.so liblog.so; do cp -v ${prebuilt_libs.out}/$i $out/lib/ done - + '' + lib.optionalString enableStatic '' + # no liblog.a; while it's also part of the base libraries, + # it's only available as shared object in the prebuilts. + for i in libc.a libm.a libdl.a; do + cp -v ${prebuilt_ndk_crt.out}/$i $out/lib/ + done + '' + '' mkdir -p $dev/include cp -v $out/include/*.h $dev/include/ ''; |