* extras/contrib/bootstrap, extras/contrib/src/Makefile: more cygwin fixes.

extras/contrib/bootstrap

@@ -51,6 +51,7 @@ echo "PREFIX = `pwd`" >> config.mak
 if test "$HOST" != "$BUILD"; then
     CC="${HOST}-gcc"
     CXX="${HOST}-g++"
+    LD="${HOST}-ld"
     RANLIB="${HOST}-ranlib"
     AR="${HOST}-ar"
 fi
@@ -118,6 +119,7 @@ esac
 
 echo "CC = ${CC}" >> config.mak
 echo "CXX = ${CXX}" >> config.mak
+echo "LD = ${LD}" >> config.mak
 echo "RANLIB = ${RANLIB}" >> config.mak
 echo "AR = ${AR}" >> config.mak
 echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak

extras/contrib/src/Makefile

@@ -54,6 +54,9 @@ endif
 ifneq ($(CXX),)
 HOSTCC+= CXX="$(CXX)"
 endif
+ifneq ($(LD),)
+HOSTCC+= LD="$(LD)"
+endif
 ifneq ($(RANLIB),)
 HOSTCC+= RANLIB="$(RANLIB)"
 endif
@@ -73,10 +76,6 @@ FFMPEGCONF=--cross-prefix=$(HOST)-
 X264CONF=--crosscompile=$(HOST)
 endif
 
-ifneq ($(BUILD),$(HOST))
-LIVECC=C_COMPILER=$(HOST)-gcc CPP=$(HOST)-cpp CPLUSPLUS_COMPILER=$(HOST)-g++ LINK="$(HOST)-g++ -o" LIBRARY_LINK="$(HOST)-ld -o"
-endif
-
 #
 # Special target-dependant options
 #
@@ -960,7 +959,7 @@ ifeq ($(HOST),ppc-darwin)
 	(cd $<; ./genMakefiles macosx-before-version-10.4 && make )
 else
 ifdef HAVE_WIN32
-	(cd $<;./genMakefiles mingw && make)
+	(cd $<;./genMakefiles mingw && make $(HOSTCC))
 else
 	(cd $<; ./genMakefiles macosx && make )
 endif