From be3c11f2f7025125df2d6af8e1c2ad792a5a9bba Mon Sep 17 00:00:00 2001 From: ketmar Date: Tue, 29 May 2012 05:39:00 +0300 Subject: [PATCH] some fixes for use-mingw32 --- defaults/Jambase.windoze | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/defaults/Jambase.windoze b/defaults/Jambase.windoze index 6b8a587..cadf613 100644 --- a/defaults/Jambase.windoze +++ b/defaults/Jambase.windoze @@ -41,10 +41,12 @@ rule setup-windoze { rule use-mingw32 { if ([ sys-has-command i686-pc-mingw32-gcc ]) { - CC = i686-pc-mingw32-gcc -pipe -static-libgcc ; - C++ = i686-pc-mingw32-g++ -pipe -static-libgcc -static-libstdc++ ; - LINK = i686-pc-mingw32-gcc -pipe -static-libgcc -Wl,--enable-auto-import ; - C++LINK = i686-pc-mingw32-g++ -pipe -static-libgcc -static-libstdc++ -Wl,--enable-auto-import ; + if ! $(MINGW32-CC) { MINGW32-CC = i686-pc-mingw32-gcc ; } + if ! $(MINGW32-C++) { MINGW32-CC = i686-pc-mingw32-g++ ; } + CC = $(MINGW32-CC) -pipe -static-libgcc ; + C++ = $(MINGW32-C++) -pipe -static-libgcc -static-libstdc++ ; + LINK = $(MINGW32-CC) -pipe -static-libgcc -Wl,--enable-auto-import ; + C++LINK = $(MINGW32-C++) -pipe -static-libgcc -static-libstdc++ -Wl,--enable-auto-import ; AR = i686-pc-mingw32-ar -ru ; RANLIB = i686-pc-mingw32-ranlib ; -- 2.11.4.GIT