commit 69cde4d543f12ac55c47987b67412ddd10ac5bb3 · pyrox.dev/nixpkgs

+13 -10
pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix
···

       16
       16
        
         # glibc.  At this early pre-glibc stage these files sometimes

     

       17
       17
        
         # have different names.

     

       18
       18
        
         crtstuff-ofiles =

     

       19
       19
       -
           if stdenv.targetPlatform.isPower then "ecrti.o ecrtn.o ncrti.o ncrtn.o" else "crti.o crtn.o";

     

       19
       19
       +
           if stdenv.targetPlatform.isPower64 then "ecrti.o ecrtn.o ncrti.o ncrtn.o" else "crti.o crtn.o";

     

       20
       20
        
       

     

       21
       21
        
         # Normally, `SHLIB_LC` is set to `-lc`, which means that

     

       22
       22
        
         # `libgcc_s.so` cannot be built until `libc.so` is available.

     
···

       28
       28
        
         # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the

     

       29
       29
        
         # versions which have been repackaged in libc as `crt{n,i}.o`

     

       30
       30
        
         #

     

       31
       31
       -
         SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib";

     

       31
       31
       +
         SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower64 "-mnewlib";

     

       32
       32
        
       

     

       33
       33
        
       in

     

       34
       34
        
       ''

     
···

       47
       47
        
       # https://www.openwall.com/lists/musl/2022/11/09/3

     

       48
       48
        
       #

     

       49
       49
        
       # 'parsed.cpu.family' won't be correct for every platform.

     

       50
       50
       -
       +

     

       51
       51
       -
         lib.optionalString

     

       52
       52
       -
           (

     

       53
       53
       -
             stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390 || stdenv.targetPlatform.isAlpha

     

       54
       54
       -
           )

     

       55
       55
       -
           ''

     

       56
       56
       -
             touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S

     

       57
       57
       -
           ''

     

       50
       50
       +
       + (lib.optionalString

     

       51
       51
       +
         (

     

       52
       52
       +
           stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390 || stdenv.targetPlatform.isAlpha

     

       53
       53
       +
         )

     

       54
       54
       +
         ''

     

       55
       55
       +
           touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S

     

       56
       56
       +
         ''

     

       57
       57
       +
       )

     

       58
       58
       +
       + lib.optionalString (stdenv.targetPlatform.isPower && !stdenv.targetPlatform.isPower64) ''

     

       59
       59
       +
         touch libgcc/config/rs6000/crt{i,n}.S

     

       60
       60
       +
       ''