Browse code

Merge pull request #40169 from cpuguy83/windows_version_quad_err

Windows: Only set VERSION_QUAD if unset

Sebastiaan van Stijn authored on 2019/11/12 10:14:12
Showing 1 changed files
... ...
@@ -57,7 +57,9 @@ if [ "$(go env GOOS)" = "windows" ]; then
57 57
 	fi
58 58
 
59 59
 	# Generate a Windows file version of the form major,minor,patch,build (with any part optional)
60
-	VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
60
+	if [ ! -v VERSION_QUAD ]; then
61
+		VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
62
+	fi
61 63
 
62 64
 	# Pass version and commit information into the resource compiler
63 65
 	defs=