commit 0c0fad6141cf3d620ae17d69431a0d152c9fd73e · pyrox.dev/nixpkgs

+1 -1

lib/systems/doubles.nix

···

       26
       26
        
         allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;

     

       27
       27
        
         none = [];

     

       28
       28
        
       

     

       29
       29
       -
         arm     = filterDoubles predicates.isArm32;

     

       29
       29
       +
         arm     = filterDoubles predicates.isArm;

     

       30
       30
        
         i686    = filterDoubles predicates.isi686;

     

       31
       31
        
         mips    = filterDoubles predicates.isMips;

     

       32
       32
        
         x86_64  = filterDoubles predicates.isx86_64;

+1 -1

pkgs/build-support/cc-wrapper/default.nix

···

       66
       66
        
           else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"

     

       67
       67
        
           else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"

     

       68
       68
        
           # ARM with a wildcard, which can be "" or "-armhf".

     

       69
       69
       -
           else if targetPlatform.isArm32                    then "${libc_lib}/lib/ld-linux*.so.3"

     

       69
       69
       +
           else if targetPlatform.isArm                      then "${libc_lib}/lib/ld-linux*.so.3"

     

       70
       70
        
           else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"

     

       71
       71
        
           else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"

     

       72
       72
        
           else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1"

+1 -1

pkgs/build-support/gcc-wrapper-old/default.nix

···

       92
       92
        
             (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else

     

       93
       93
        
              if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else

     

       94
       94
        
              # ARM with a wildcard, which can be "" or "-armhf".

     

       95
       95
       -
              if targetPlatform.isArm32                    then "ld-linux*.so.3" else

     

       95
       95
       +
              if targetPlatform.isArm                      then "ld-linux*.so.3" else

     

       96
       96
        
              if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else

     

       97
       97
        
              if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else

     

       98
       98
        
              if targetPlatform.system == "mips64el-linux" then "ld.so.1" else

+1 -1

pkgs/development/compilers/gcc/4.5/default.nix

···

       233
       233
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       234
       234
        
         configurePlatforms =

     

       235
       235
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       236
       236
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       236
       236
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       237
       237
        
           then []

     

       238
       238
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       239
       239

+1 -1

pkgs/development/compilers/gcc/4.8/default.nix

···

       319
       319
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       320
       320
        
         configurePlatforms =

     

       321
       321
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       322
       322
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       322
       322
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       323
       323
        
           then []

     

       324
       324
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       325
       325

+1 -1

pkgs/development/compilers/gcc/4.9/default.nix

···

       319
       319
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       320
       320
        
         configurePlatforms =

     

       321
       321
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       322
       322
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       322
       322
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       323
       323
        
           then []

     

       324
       324
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       325
       325

+1 -1

pkgs/development/compilers/gcc/5/default.nix

···

       336
       336
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       337
       337
        
         configurePlatforms =

     

       338
       338
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       339
       339
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       339
       339
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       340
       340
        
           then []

     

       341
       341
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       342
       342

+1 -1

pkgs/development/compilers/gcc/6/default.nix

···

       328
       328
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       329
       329
        
         configurePlatforms =

     

       330
       330
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       331
       331
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       331
       331
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       332
       332
        
           then []

     

       333
       333
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       334
       334

+1 -1

pkgs/development/compilers/gcc/7/default.nix

···

       330
       330
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       331
       331
        
         configurePlatforms =

     

       332
       332
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       333
       333
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       333
       333
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       334
       334
        
           then []

     

       335
       335
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       336
       336

+1 -1

pkgs/development/compilers/gcc/snapshot/default.nix

···

       317
       317
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       318
       318
        
         configurePlatforms =

     

       319
       319
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       320
       320
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       320
       320
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       321
       321
        
           then []

     

       322
       322
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       323
       323

+1 -1

pkgs/development/tools/misc/binutils/default.nix

···

       86
       86
        
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       87
       87
        
         configurePlatforms =

     

       88
       88
        
           # TODO(@Ericson2314): Figure out what's going wrong with Arm

     

       89
       89
       -
           if hostPlatform == targetPlatform && targetPlatform.isArm32

     

       89
       89
       +
           if hostPlatform == targetPlatform && targetPlatform.isArm

     

       90
       90
        
           then []

     

       91
       91
        
           else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       92
       92

+1 -3

pkgs/stdenv/generic/default.nix

···

       104
       104
        
             # Utility flags to test the type of platform.

     

       105
       105
        
             inherit (hostPlatform)

     

       106
       106
        
               isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD

     

       107
       107
       -
               isi686 isx86_64 is64bit isMips isBigEndian;

     

       108
       108
       -
             isArm = hostPlatform.isArm32;

     

       109
       109
       -
             isAarch64 = hostPlatform.isArm64;

     

       107
       107
       +
               isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian;

     

       110
       108
        
       

     

       111
       109
        
             # Whether we should run paxctl to pax-mark binaries.

     

       112
       110
        
             needsPax = isLinux;