commit 145d9726f37ec8ba4567bfb0b5b393423b07c482 · pyrox.dev/nixpkgs

+13 -6
pkgs/build-support/cc-wrapper/default.nix
···

       126
       126
        
         libc_dev = optionalString (libc != null) (getDev libc);

     

       127
       127
        
         libc_lib = optionalString (libc != null) (getLib libc);

     

       128
       128
        
         cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       129
       129
       +
         cc_bin = getBin cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

     

       129
       130
        
       

     

       130
       131
        
         # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

     

       131
       132
        
         coreutils_bin = optionalString (!nativeTools) (getBin coreutils);

     
···

       590
       591
        
         ]

     

       591
       592
        
         ++ optional (cc.langC or true) ./setup-hook.sh

     

       592
       593
        
         ++ optional (cc.langFortran or false) ./fortran-hook.sh

     

       593
       593
       -
         ++ optional (targetPlatform.isWindows) (

     

       594
       594
       +
         ++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (

     

       594
       595
        
           stdenvNoCC.mkDerivation {

     

       595
       596
        
             name = "win-dll-hook.sh";

     

       596
       597
        
             dontUnpack = true;

     

       597
       597
       -
             installPhase = ''

     

       598
       598
       -
               echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out

     

       599
       599
       -
               echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out

     

       600
       600
       -
               echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out

     

       601
       601
       -
             '';

     

       598
       598
       +
             installPhase =

     

       599
       599
       +
               if targetPlatform.isCygwin then

     

       600
       600
       +
                 ''

     

       601
       601
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_bin}/lib" >> $out

     

       602
       602
       +
                 ''

     

       603
       603
       +
               else

     

       604
       604
       +
                 ''

     

       605
       605
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib" > $out

     

       606
       606
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib64" >> $out

     

       607
       607
       +
                   echo addToSearchPath "LINK_DLL_FOLDERS" "${cc_solib}/lib32" >> $out

     

       608
       608
       +
                 '';

     

       602
       609
        
           }

     

       603
       610
        
         );

     

       604
       611