Unverified Commit e829eca8 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #253939 from angerman/angerman/ucrt64 

Add ucrt64 mingw toolchain.
parents b89a0c67 1e0561d7

lib/systems/examples.nix

+5 −0
Original line number Diff line number Diff line
@@ -313,6 +313,11 @@ rec { 
    libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain

  };



  ucrt64 = {

    config = "x86_64-w64-mingw32";

    libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain

  };



  # BSDs



  x86_64-freebsd = {

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
@@ -20,7 +20,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

  );
@@ -259,7 +259,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

  '';