[or-cvs] r19665: {torvm} Mitigate flawed cmake bootstrap in pure msys build environme (torvm/trunk/build/win32/files)

coderman at seul.org coderman at seul.org
Mon Jun 8 22:43:56 UTC 2009


Author: coderman
Date: 2009-06-08 18:43:55 -0400 (Mon, 08 Jun 2009)
New Revision: 19665

Modified:
   torvm/trunk/build/win32/files/buildall.sh
Log:
Mitigate flawed cmake bootstrap in pure msys build environment.

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-06-08 22:24:11 UTC (rev 19664)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-06-08 22:43:55 UTC (rev 19665)
@@ -806,6 +806,9 @@
   cd /usr/src
   tar zxf $CMAKE_FILE
   cd $CMAKE_DIR
+  # cmake bootstrap does not detect msys correctly. give it some help...
+  export SAVE_MSYSTEM="$MSYSTEM"
+  export MSYSTEM=MINGW32
   ./bootstrap --no-qt-gui
   if (( $? != 0 )); then
     echo "ERROR: CMake bootstrap / configure failed."
@@ -821,6 +824,8 @@
     echo "ERROR: CMake install failed."
     exit 1
   fi
+  export MSYSTEM="$SAVE_MSYSTEM"
+  unset SAVE_MSYSTEM
 
   pkgbuilt CMAKE_BUILT
 fi



More information about the tor-commits mailing list