Commit a81e3dcd authored by Moritz Angermann's avatar Moritz Angermann
Browse files

treewide: replace libc == "msvcrt" with isMinGW 

msvcrt is only one of the libcs in MinGW. We therefore
replace explictly testing for msvcrt with the isMinGW
predicate. This lays the foundation for ucrt64 support.
parent 127ddbae

pkgs/development/compilers/gcc/common/configure-flags.nix

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ let 
  # See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903

  disableBootstrap' = disableBootstrap && !langFortran && !langGo;



  crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";

  crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW;

  crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";



  targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)

pkgs/development/compilers/gcc/common/libgcc.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ drv: lib.pipe drv 
  (pkg: pkg.overrideAttrs (previousAttrs:

    lib.optionalAttrs (

      targetPlatform != hostPlatform &&

      (enableShared || targetPlatform.libc == "msvcrt") &&

      (enableShared || targetPlatform.isMinGW) &&

      withoutTargetLibc

    ) {

      makeFlags = [ "all-gcc" "all-target-libgcc" ];

pkgs/development/compilers/gcc/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ let inherit version; 
    patches = callFile ./patches {};



    /* Cross-gcc settings (build == host != target) */

    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";

    crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW;

    stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final";

    crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";

pkgs/development/libraries/boost/generic.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
, enableDebug ? false

, enableSingleThreaded ? false

, enableMultiThreaded ? true

, enableShared ? !(with stdenv.hostPlatform; isStatic || libc == "msvcrt") # problems for now

, enableShared ? !(with stdenv.hostPlatform; isStatic || isMinGW) # problems for now

, enableStatic ? !enableShared

, enablePython ? false

, enableNumpy ? false
@@ -91,7 +91,7 @@ let 
    ++ lib.optional (!enablePython) "--without-python"

    ++ lib.optional needUserConfig "--user-config=user-config.jam"

    ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off"

    ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [

    ++ lib.optionals stdenv.hostPlatform.isMinGW [

    "threadapi=win32"

  ] ++ extraB2Args

  );
@@ -252,7 +252,7 @@ stdenv.mkDerivation { 
    # Make boost header paths relative so that they are not runtime dependencies

    cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \

      -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;

  '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") ''

  '' + lib.optionalString stdenv.hostPlatform.isMinGW ''

    $RANLIB "$out/lib/"*.a

  '';

pkgs/development/libraries/libiconv/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec { 
  ];



  postPatch =

    lib.optionalString ((stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc)

    lib.optionalString ((stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isMinGW) || stdenv.cc.nativeLibc)

      ''

        sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h

      ''