diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-06-29 10:30:08 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-10-26 20:07:18 -0700 |
| commit | 1904125877858b9013c286e2cfc7b0acf4895789 (patch) | |
| tree | d8fd41ce566e5aeda0b5aa0c6fd6955fd0755cbf /pkgs/development/compilers/gcc | |
| parent | 58a63d40e39220dd455bfbc94db505a09cf30f91 (diff) | |
| download | nixlib-1904125877858b9013c286e2cfc7b0acf4895789.tar nixlib-1904125877858b9013c286e2cfc7b0acf4895789.tar.gz nixlib-1904125877858b9013c286e2cfc7b0acf4895789.tar.bz2 nixlib-1904125877858b9013c286e2cfc7b0acf4895789.tar.lz nixlib-1904125877858b9013c286e2cfc7b0acf4895789.tar.xz nixlib-1904125877858b9013c286e2cfc7b0acf4895789.tar.zst nixlib-1904125877858b9013c286e2cfc7b0acf4895789.zip | |
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 <Artturin@artturin.com> Co-authored-by: John Ericson <git@JohnEricson.me>
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 4544f3862fea..6b8d22a681b6 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 = [ |