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