diff options
author | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2011-09-26 17:22:36 +0200 |
commit | 9fce6b663d7183caaeed09cdb25d036d29c35215 (patch) | |
tree | bb8bd0acad9da39a49b4aef2072d59dbbb30f3a9 /otp_build | |
parent | b98b8bdfde49de28c6c7b65f35930e5ad79eeea2 (diff) | |
parent | edb449fc7f7ea9861b322edb6c00da907cec8c9c (diff) | |
download | otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.gz otp-9fce6b663d7183caaeed09cdb25d036d29c35215.tar.bz2 otp-9fce6b663d7183caaeed09cdb25d036d29c35215.zip |
Merge branch 'sverker/remove-static-ssl-linking/OTP-9566' into maint-r14
* sverker/remove-static-ssl-linking/OTP-9566:
crypto: touch Makefile to provoke patch release
Change static link test of ssl to dynamic
Remove static ssl linking in crypto for otp_build
Diffstat (limited to 'otp_build')
-rwxr-xr-x | otp_build | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -186,15 +186,15 @@ 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 + # Link SSL static for win32 binary distributions if not overridden if target_contains win32; then + 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" |