diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-10 12:30:33 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-10 14:52:20 +0200 |
| commit | 20c9d6e23f3572873c32daf7053819a844427a4b (patch) | |
| tree | 720c22c4bfa1c0141d8fdaf85ba9e4a66d9457b2 /otp_build | |
| parent | e3af9123e7ef9291535cafbd0ecb9d3309d674f7 (diff) | |
| download | otp-20c9d6e23f3572873c32daf7053819a844427a4b.tar.gz otp-20c9d6e23f3572873c32daf7053819a844427a4b.tar.bz2 otp-20c9d6e23f3572873c32daf7053819a844427a4b.zip | |
Link OpenSSL libraries static on Windows
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -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 |