From 1904125877858b9013c286e2cfc7b0acf4895789 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 29 Jun 2023 10:30:08 -0700 Subject: [PATCH] gcc: change "-stage-static" to "-nolibc" and "-stage-final" to "" This commit changes the target suffix for the first-stage cross compiler from `-stage-static` to `-nolibc`, and eliminates the target suffix from the final-stage cross compiler (previously `-stage-final`). Co-authored-by: Artturi Co-authored-by: John Ericson --- pkgs/development/compilers/gcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 4544f3862fea3d1..6b8d22a681b65f6 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -117,8 +117,8 @@ let inherit version; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; - stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; - crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + stageNameAddon = optionalString withoutTargetLibc "-nolibc"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; javaAwtGtk = langJava && x11Support; xlibs = [