aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-21 19:44:34 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-21 19:44:34 +0200
commit8c1b51850b78fdb70639c34eca983d83f4827240 (patch)
tree8ea7c7ccd202c6863f3e5e00bb215cc26f73edbe /otp_build
parent3d31498a0d08a9cf572fc966c025ed44ef15e831 (diff)
downloadotp-8c1b51850b78fdb70639c34eca983d83f4827240.tar.gz
otp-8c1b51850b78fdb70639c34eca983d83f4827240.tar.bz2
otp-8c1b51850b78fdb70639c34eca983d83f4827240.zip
Remove static ssl linking in crypto for otp_build
Diffstat (limited to 'otp_build')
-rwxr-xr-xotp_build12
1 files changed, 6 insertions, 6 deletions
diff --git a/otp_build b/otp_build
index aed34b76a8..44bbab22b5 100755
--- a/otp_build
+++ b/otp_build
@@ -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"