diff options
| author | Artturi <Artturin@artturin.com> | 2023-10-27 17:13:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-27 17:13:59 +0300 |
| commit | 4693035911dbbba0459bd8e0234310335f93f5f0 (patch) | |
| tree | 714f33dc7b384c698ba3be1228f1cade1d6d24a0 /pkgs/development/compilers/gcc | |
| parent | b47fe7087657be235ecd3f9484fc4f855cb59540 (diff) | |
| parent | 1904125877858b9013c286e2cfc7b0acf4895789 (diff) | |
| download | nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.tar nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.tar.gz nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.tar.bz2 nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.tar.lz nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.tar.xz nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.tar.zst nixlib-4693035911dbbba0459bd8e0234310335f93f5f0.zip | |
Merge pull request #240596 from amjoseph-nixpkgs/pr/gcc/stage-rename
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 = [ |