Merge branch 'pan/win_static_openssl/OTP-9280' into dev

* pan/win_static_openssl/OTP-9280:
  Mend --with-ssl= in erts/configure
  Update OpenSSL license text in crypto
  Link OpenSSL libraries static on Windows

1 files changed, 8 insertions, 7 deletions

diff --git a/otp_build b/otp_build
index 1172592415..aebb91372c 100755
--- a/otp_build
+++ b/otp_build
@@ -186,15 +186,16 @@ set_config_flags ()
 	if target_contains free_source; then
 		CONFIG_FLAGS="$CONFIG_FLAGS --host=$TARGET"
 	fi
+	# Link SSL static for all binary distributions if not overridden
+	# Even for win32 starting with R14B03
+	XX=`echo $* | grep -v dynamic-ssl-lib`
+	if [ "$*" = "$XX" ]; then 
+	    CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
+	fi
 	if target_contains win32; then
-		CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" 
-	else
-	        # Link SSL static for all binary distributions if not overridden
-	        XX=`echo $* | grep -v dynamic-ssl-lib`
-		if [ "$*" = "$XX" ]; then 
-		    CONFIG_FLAGS="--disable-dynamic-ssl-lib $CONFIG_FLAGS"
-		fi
+	    CONFIG_FLAGS="--build=$BUILDSYS build_alias=win32 --host=win32 --target=win32 $CONFIG_FLAGS" 
 	fi
+
 	if [ "x$OVERRIDE_CONFIG_CACHE" = "x" ]; then
 	    CONFIG_FLAGS="$CONFIG_FLAGS --cache-file=/dev/null"
 	else