gcc-4.8: Use --with-as/ld for MinGW-w64 as well.

On MinGW, we're passing these programs to the configure script, but this
obviously won't work for non-autoconf-based projects.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-03-12 10:55:51 +01:00
parent c7bac81c66
commit 23b43c6a9b
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961

View file

@ -162,12 +162,13 @@ let version = "4.8.2";
" --disable-shared" +
" --disable-decimal-float" # libdecnumber requires libc
else
(if crossDarwin then
" --with-sysroot=${libcCross}/share/sysroot" +
(if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
else " --with-headers=${libcCross}/include") +
# Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" +
" --with-ld=${binutilsCross}/bin/${cross.config}-ld"
else
" --with-headers=${libcCross}/include") +
)) +
" --enable-__cxa_atexit" +
" --enable-long-long" +
(if crossMingw then