Commit 5c1955ff authored by John Ericson's avatar John Ericson
Browse files

libcCross: Remove! 

We have a long-standing goal of nothing with "cross" in its name. This
gets us much closer!
parent 66576dcd

pkgs/by-name/qm/qmk/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { 
      pkgsCross.avr.buildPackages.binutils

      pkgsCross.avr.buildPackages.binutils.bintools

      pkgsCross.avr.buildPackages.gcc

      pkgsCross.avr.libcCross

      pkgsCross.avr.libc

    ];



  # no tests implemented

pkgs/by-name/sh/shadow/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  libxslt,

  libxcrypt,

  pkg-config,

  glibcCross ? null,

  glibc ? null,

  pam ? null,

  withLibbsd ? lib.meta.availableOn stdenv.hostPlatform libbsd,

  libbsd,
@@ -24,7 +24,7 @@ 
let

  glibc =

    if stdenv.hostPlatform != stdenv.buildPlatform then

      glibcCross

      glibc

    else

      assert stdenv.hostPlatform.libc == "glibc";

      stdenv.cc.libc;

pkgs/development/compilers/gcc/all.nix

+9 −4
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@ 
  lib,

  stdenv,

  pkgs,

  targetPackages,

  callPackage,

  isl_0_20,

  libcCross,

  threadsCross,

  noSysDirs,

  lowPrio,

  wrapCC,
@@ -27,9 +26,15 @@ let 
            reproducibleBuild = true;

            profiledCompiler = false;

            libcCross =

              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then args.libcCross else null;

              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then

                targetPackages.libc or pkgs.libc

              else

                null;

            threadsCross =

              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then threadsCross else { };

              if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then

                targetPackages.threads or pkgs.threads

              else

                { };

            isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20;

            # do not allow version skew when cross-building gcc

            #

pkgs/development/compilers/gcc/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
  enablePlugin ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform), # Whether to support user-supplied plug-ins

  name ? "gcc",

  libcCross ? null,

  threadsCross ? null, # for MinGW

  threadsCross ? { }, # for MinGW

  withoutTargetLibc ? false,

  flex,

  gnused ? null,

pkgs/development/compilers/go/1.23.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  mailcap,

  buildPackages,

  pkgsBuildTarget,

  threadsCross,

  targetPackages,

  testers,

  skopeo,

  buildGo123Module,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 


  depsBuildTarget = lib.optional isCross targetCC;



  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;

  depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows targetPackages.threads.package;



  postPatch = ''

    patchShebangs .