Changeset 3014 for box/trunk

Timestamp:

09/10/2011 11:52:04 (8 months ago)

Author:

chris

Message:

Pass the correct LDFLAGS to Box Backup, to use mingw zlib instead of cygwin,
copied from new Boxi config. Thanks to Achim for finding this and testing
the fix.

File:

• box/trunk/infrastructure/mingw/configure.sh (modified) (2 diffs)

box/trunk/infrastructure/mingw/configure.sh

@@ -17 +17 @@
 fi
 
-export CC="gcc -mno-cygwin"
-export CXX="g++ -mno-cygwin"
-export LD="g++ -mno-cygwin"
-export CFLAGS="-mno-cygwin -mthreads"
-export CXXFLAGS="-mno-cygwin -mthreads"
-export LDFLAGS="-mno-cygwin -mthreads"
-export LIBS="-lcrypto -lws2_32 -lgdi32"
-
 if [ ! -x "configure" ]; then
         if ! ./bootstrap; then
@@ -32 +24 @@
 fi
 
-if ! ./configure --target=i686-pc-mingw32 "$@"; then
+if ! ./configure "$@" --target=i686-pc-mingw32 \
+        CFLAGS="-mno-cygwin -mthreads" \
+        CPPFLAGS="-mno-cygwin" \
+        CXXFLAGS="-mno-cygwin -mthreads" \
+        LDFLAGS="-mno-cygwin -mthreads -L${DEP_PATH}/lib" \
+        LIBS="-lcrypto -lws2_32 -lgdi32"
+then
         echo "Error: configure failed, aborting." >&2
         exit 1