JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #305387 from wegank/mcfgthread-12-drop

Browse Source 
windows.mcfgthreads_pre_gcc_13: drop
This commit is contained in:
Weijia Wang 2024-05-22 20:05:33 +02:00 committed by GitHub
commit fbe324ceae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gcc/all.nix
View File

@ -5,7 +5,7 @@
, callPackage
, isl_0_11, isl_0_14, isl_0_17, isl_0_20
, libcCross
, threadsCrossFor
, threadsCross
, noSysDirs
, texinfo5
, cloog_0_18_0, cloog
@ -25,7 +25,7 @@ let
reproducibleBuild = true;
profiledCompiler = false;
libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null;
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor majorMinorVersion else { };
threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
isl = if stdenv.isDarwin then null
else if atLeast "9" then isl_0_20
else if atLeast "7" then isl_0_17

4
pkgs/os-specific/windows/default.nix
View File

@ -34,10 +34,6 @@ lib.makeScope newScope (self: with self; {
stdenv = crossThreadsStdenv;
};
mcfgthreads_pre_gcc_13 = callPackage ./mcfgthreads/pre_gcc_13.nix {
stdenv = crossThreadsStdenv;
};
mcfgthreads = callPackage ./mcfgthreads {
stdenv = crossThreadsStdenv;
};

24
pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation {
pname = "mcfgthreads";
version = "git"; # unstable-2021-03-12, not in any branch
src = fetchFromGitHub {
owner = "lhmouse";
repo = "mcfgthread";
rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
};
outputs = [ "out" "dev" ];
# Don't want prebuilt binaries sneaking in.
postUnpack = ''
rm -r "$sourceRoot/debug" "$sourceRoot/release"
'';
nativeBuildInputs = [
autoreconfHook
];
}

10
pkgs/top-level/all-packages.nix
View File

@ -17005,7 +17005,7 @@ with pkgs;
# want the C++ library to be explicitly chosen by the caller, and null by
# default.
libcxx ? null
, extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) ((threadsCrossFor cc.version).package)
, extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package
, nixSupport ? {}
, ...
} @ extraArgs:
@ -21044,16 +21044,12 @@ with pkgs;
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
threadsCross = threadsCrossFor null;
threadsCrossFor = cc_version:
threadsCross =
lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) {
# other possible values: win32 or posix
model = "mcf";
# For win32 or posix set this to null
package =
if cc_version == null || lib.versionAtLeast cc_version "13"
then targetPackages.windows.mcfgthreads or windows.mcfgthreads
else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13;
package = targetPackages.windows.mcfgthreads or windows.mcfgthreads;
};
wasilibc = callPackage ../development/libraries/wasilibc {