commit dffc94678602a9b9be0e960ba4dfdd6d5e2cff4c · pyrox.dev/nixpkgs

+16 -1
pkgs/development/compilers/gcc/ng/common/default.nix
···

       131
       131
        
                 "-B${targetGccPackages.libgcc}/lib"

     

       132
       132
        
                 "-B${targetGccPackages.libssp}/lib"

     

       133
       133
        
                 "-B${targetGccPackages.libatomic}/lib"

     

       134
       134
       +
                 "-B${targetGccPackages.libgfortran}/lib/"

     

       135
       135
       +
               ];

     

       136
       136
       +
             };

     

       137
       137
       +
       

     

       138
       138
       +
             gfortranNoLibgfortran = wrapCCWith rec {

     

       139
       139
       +
               cc = gccPackages.gfortran-unwrapped;

     

       140
       140
       +
               libcxx = targetGccPackages.libstdcxx;

     

       141
       141
       +
               bintools = binutils;

     

       142
       142
       +
               extraPackages = [

     

       143
       143
       +
                 targetGccPackages.libgcc

     

       144
       144
       +
               ];

     

       145
       145
       +
               nixSupport.cc-cflags = [

     

       146
       146
       +
                 "-B${targetGccPackages.libgcc}/lib"

     

       147
       147
       +
                 "-B${targetGccPackages.libssp}/lib"

     

       148
       148
       +
                 "-B${targetGccPackages.libatomic}/lib"

     

       134
       149
        
               ];

     

       135
       150
        
             };

     

       136
       151
        
       

     
···

       211
       226
        
       

     

       212
       227
        
             libgfortran = callPackage ./libgfortran {

     

       213
       228
        
               stdenv = overrideCC stdenv buildGccPackages.gcc;

     

       214
       214
       -
               inherit (buildGccPackages) gfortran;

     

       229
       229
       +
               gfortran = buildGccPackages.gfortranNoLibgfortran;

     

       215
       230
        
             };

     

       216
       231
        
       

     

       217
       232
        
             libstdcxx = callPackage ./libstdcxx {