win32*.sh: improve win32 dependency check

At the moment, we assume that the dependencies have been successfully built if the "build.deps" directory exists. For convenience reasons, this change will use a file instead, signaling that we've finished building the dependencies. This will allow the build process to be resumed when interrupted. Signed-off-by: Mike Latimer <[email protected]> Signed-off-by: Lucian Petrut <[email protected]>
gsoneill · Dec 9, 2020 · ae812dc · ae812dc
1 parent 451fe3d
commit ae812dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/win32_build.sh b/win32_build.sh
@@ -65,9 +65,10 @@ curlInclude="${curlDir}/include"
 if [[ -n $CLEAN_BUILD ]]; then
     echo "Cleaning up build dir: $BUILD_DIR"
     rm -rf $BUILD_DIR
+    rm -rf $DEPS_DIR
 fi
 
-if [[ ! -d $DEPS_DIR ]]; then
+if [[ ! -f ${depsToolsetDir}/completed ]]; then
     echo "Preparing dependencies: $DEPS_DIR"
     NUM_WORKERS=$NUM_WORKERS DEPS_DIR=$DEPS_DIR \
         "$SCRIPT_DIR/win32_deps_build.sh"

diff --git a/win32_deps_build.sh b/win32_deps_build.sh
@@ -331,3 +331,5 @@ EOF
 
 x86_64-w64-mingw32-dlltool -d $winLibDir/mswsock.def \
                            -l $winLibDir/libmswsock.a
+
+touch $depsToolsetDir/completed
Original file line number	Diff line number	Diff line change
Expand Up		@@ -331,3 +331,5 @@ EOF

		x86_64-w64-mingw32-dlltool -d $winLibDir/mswsock.def \
		-l $winLibDir/libmswsock.a

		touch $depsToolsetDir/completed