diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-06-16 14:45:50 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-07-01 13:12:41 -0700 |
commit | 443dfc4b05360794aa0304459177557107274559 (patch) | |
tree | eed0b6067ef12270fd60468e6d41d80d04425e5e /pkgs/development/compilers/gcc/10/default.nix | |
parent | 2affd455a40a28825f356307ce5bd8fa2f202217 (diff) |
gcc: s_crossStageStatic_withoutTargetLibc_
This commit renames the `crossStageStatic` argument to the `gcc` expression to `withoutTargetLibc`. See previous commit for details.
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index d384298993728..9f49cc2b91f5c 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -22,7 +22,7 @@ , name ? "gcc" , libcCross ? null , threadsCross ? null # for MinGW -, crossStageStatic ? false +, withoutTargetLibc ? false , gnused ? null , cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -69,7 +69,7 @@ let majorVersion = "10"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; @@ -78,7 +78,7 @@ let majorVersion = "10"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; callFile = lib.callPackageWith { @@ -99,7 +99,7 @@ let majorVersion = "10"; binutils buildPackages cloog - crossStageStatic + withoutTargetLibc enableLTO enableMultilib enablePlugin @@ -214,7 +214,7 @@ lib.pipe (stdenv.mkDerivation ({ ) ''; - inherit noSysDirs staticCompiler crossStageStatic + inherit noSysDirs staticCompiler withoutTargetLibc libcCross crossMingw; inherit (callFile ../common/dependencies.nix { }) @@ -295,5 +295,5 @@ lib.pipe (stdenv.mkDerivation ({ // optionalAttrs (enableMultilib) { dontMoveLib64 = true; } )) [ - (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform enableShared crossStageStatic; }) + (callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform withoutTargetLibc; }) ] |