public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74016 from Ericson2314/gcc-fix-cross-name

Browse Source 
gcc: Fix cross names
This commit is contained in:
John Ericson
2019-11-24 11:03:07 -05:00
committed by GitHub
parent 82d38927aa 62d6429793
commit 195c263a81
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/4.8/default.nix
+3 -3
View File
@@ -102,8 +102,8 @@ let majorVersion = "4";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
@@ -111,7 +111,7 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
builder = ../builder.sh;