diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-24 01:16:02 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-24 01:17:01 +0300 |
| commit | 0c0fad6141cf3d620ae17d69431a0d152c9fd73e (patch) | |
| tree | d6c0db74aa9b58ced0b594459ce496fcffce35b4 /pkgs/build-support/cc-wrapper/default.nix | |
| parent | 46930ef3e64ce0b717e1ce25a39edf71095e479f (diff) | |
| download | nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.tar nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.tar.gz nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.tar.bz2 nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.tar.lz nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.tar.xz nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.tar.zst nixpkgs-0c0fad6141cf3d620ae17d69431a0d152c9fd73e.zip | |
treewide: Consistently call ARM 'arm'
No need for silly differences.
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b3971808a2b..05c1fe6fa54 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -66,7 +66,7 @@ let else if targetPlatform.system == "i686-linux" then "${libc_lib}/lib/ld-linux.so.2" else if targetPlatform.system == "x86_64-linux" then "${libc_lib}/lib/ld-linux-x86-64.so.2" # ARM with a wildcard, which can be "" or "-armhf". - else if targetPlatform.isArm32 then "${libc_lib}/lib/ld-linux*.so.3" + else if targetPlatform.isArm then "${libc_lib}/lib/ld-linux*.so.3" else if targetPlatform.system == "aarch64-linux" then "${libc_lib}/lib/ld-linux-aarch64.so.1" else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1" |