diff options
| author | Dan Gudmundsson <[email protected]> | 2015-10-27 10:22:27 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-10-27 10:22:27 +0100 |
| commit | 4b5853e7865d6a1baab39d7345b1b8d0280a4291 (patch) | |
| tree | 61699b0084530ddf47d49bb86bd54abc708a8dd5 /otp_build | |
| parent | fe04061666bdf31ae894a099b266fcb1ce299fd5 (diff) | |
| parent | 36707f0eac0fdb61331a8cee4917a00a301528a3 (diff) | |
| download | otp-4b5853e7865d6a1baab39d7345b1b8d0280a4291.tar.gz otp-4b5853e7865d6a1baab39d7345b1b8d0280a4291.tar.bz2 otp-4b5853e7865d6a1baab39d7345b1b8d0280a4291.zip | |
Merge branch 'maint'
* maint:
cdv: Fix crashdump ets table type
observer: Show ets owner pid in crashdump viewers ets popup window
erts: Detect and build on MSYS2 for windows
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1443,13 +1443,13 @@ case "$1" in do_debuginfo_win32 "$2";; env_win32) if [ x"$2" = x"x64" -o x"$2" = x"amd64" ]; then - if [ -x /usr/bin/msysinfo ]; then + if [ -x /usr/bin/msys-?.0.dll ]; then echo_env_msys64 else echo_env_win64 fi else - if [ -x /usr/bin/msysinfo ]; then + if [ -x /usr/bin/msys-?.0.dll ]; then echo_env_msys32 else echo_env_win32 |