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

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index c5e45877be8c81ad3b9d8325aafea527316089f0..defd8f5fd26dbfe19ecbc40a78d437fe6b7103d6 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 61362359a6f98b93ee866acf4e9c3a97a189543b..8fec45bf0b8cc6c0ca531da6feb58501fecd01d6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/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