diff options
| author | Henrik Nord <[email protected]> | 2015-11-02 10:24:03 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-11-02 10:24:03 +0100 |
| commit | 33b1771503cd399c8d0ce512ed98e2701a0c4ac8 (patch) | |
| tree | 1c4853f65335f840365dad7cb964573a7faf3d92 /erts/etc/win32 | |
| parent | 7e9c71bfbcf57c08c863e1dc79e11fb8dfdf870f (diff) | |
| parent | 9b83311f160158a347d9bf4ef19e3847af60fc9f (diff) | |
| download | otp-33b1771503cd399c8d0ce512ed98e2701a0c4ac8.tar.gz otp-33b1771503cd399c8d0ce512ed98e2701a0c4ac8.tar.bz2 otp-33b1771503cd399c8d0ce512ed98e2701a0c4ac8.zip | |
Merge branch 'henrik/find-redist' into maint
Diffstat (limited to 'erts/etc/win32')
| -rwxr-xr-x | erts/etc/win32/nsis/find_redist.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/win32/nsis/find_redist.sh b/erts/etc/win32/nsis/find_redist.sh index c0895c9dd5..03e92b21c7 100755 --- a/erts/etc/win32/nsis/find_redist.sh +++ b/erts/etc/win32/nsis/find_redist.sh @@ -164,7 +164,7 @@ fi #echo $BPATH_LIST for BP in $BPATH_LIST; do - for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0" "v7.0A" "v7.1"; do + for verdir in "sdk v2.0" "sdk v3.5" "v6.0A" "v7.0" "v7.0A" "v7.1" "VC redist 1033"; do BPATH=$BP fail=false allow_fail=false |