@ -295,7 +295,6 @@ stdenv.mkDerivation ({
++ ( optionals langJava [ boehmgc zip unzip ] )
++ ( optionals javaAwtGtk ( [ gtk2 libart_lgpl ] ++ xlibs ) )
++ ( optionals ( targetPlatform != hostPlatform ) [ binutils ] )
++ ( optionals ( buildPlatform != hostPlatform ) [ buildPackages . stdenv . cc ] )
++ ( optionals langAda [ gnatboot ] )
++ ( optionals langVhdl [ gnat ] )
@ -362,7 +361,7 @@ stdenv.mkDerivation ({
)
}
$ { optionalString ( ! ( crossMingw && crossStageStatic ) )
" - - w i t h - n a t i v e - s y s t e m - h e a d e r - d i r = ${ getDev ( stdenv . ccCross or stdenv . cc ) . libc } / i n c l u d e " }
" - - w i t h - n a t i v e - s y s t e m - h e a d e r - d i r = ${ getDev stdenv . cc . libc } / i n c l u d e " }
$ { if langAda then " - - e n a b l e - l i b a d a " else " " }
$ { if targetPlatform == hostPlatform && targetPlatform . isi686 then " - - w i t h - a r c h = i 6 8 6 " else " " }
$ { if targetPlatform != hostPlatform then crossConfigureFlags else " " }
@ -431,8 +430,7 @@ stdenv.mkDerivation ({
buildFlags = " " ;
} ;
NIX_BUILD_CC = stdenv . cc ;
NIX_CC_CROSS = stdenv . ccCross or null ;
NIX_BUILD_CC = buildPackages . stdenv . cc ;
# Needed for the cross compilation to work
AR = " a r " ;