|
|
|
@ -101,8 +101,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 |
|
|
|
|
|
|
|
|
@ -110,7 +110,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; |
|
|
|
|
|
|
|
|
|