diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 19:23:50 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-18 19:25:58 -0400 |
| commit | 13fc982e650381c6ca5a76470ae1d23abbc000ab (patch) | |
| tree | 20ccc3d07933332adfc8990efd532d7da758f1b2 /pkgs/build-support/cc-wrapper/default.nix | |
| parent | a44bbc72e6b3d7c3e9619e5c74de6b6261a8e4c8 (diff) | |
| download | nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.tar nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.tar.gz nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.tar.bz2 nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.tar.lz nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.tar.xz nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.tar.zst nixlib-13fc982e650381c6ca5a76470ae1d23abbc000ab.zip | |
cc-wrapper: Use same dynamic loader on all Darwin, not just x86_64
In practice, this is correct because iOS is on ARM and puts the loader there.
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4bbd6c205e5a..999faf756ed4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -64,11 +64,11 @@ 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.isArm then "${libc_lib}/lib/ld-linux*.so.3" + else if (with targetPlatform; isArm && isLinux) 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" - else if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" + else if targetPlatform.isDarwin then "/usr/lib/dyld" else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; |