@@ -101,8 +101,8 @@ let majorVersion = "4";
101101
102102 /* Cross-gcc settings (build == host != target) */
103103 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
104− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
105− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
104+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
105+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
106106
107107in
108108
@@ -110,7 +110,7 @@ in
110110assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
111111
112112stdenv.mkDerivation ({
113− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
113+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
114114
115115 builder = ../builder.sh;
116116