aboutsummaryrefslogtreecommitdiffstats
path: root/otp_build
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-10-27 09:57:43 +0100
committerDan Gudmundsson <[email protected]>2015-10-27 09:57:43 +0100
commit47996010a0413f984c8312bb525d96ada3c91cf7 (patch)
tree8784de6528cd2709f60e90b063684fe1be671997 /otp_build
parent7908256c72e4a110154c2db61220973fff511614 (diff)
parent4a9f688b804688ff95e256d3412ca932b9972d8a (diff)
downloadotp-47996010a0413f984c8312bb525d96ada3c91cf7.tar.gz
otp-47996010a0413f984c8312bb525d96ada3c91cf7.tar.bz2
otp-47996010a0413f984c8312bb525d96ada3c91cf7.zip
Merge branch 'dgud/msys2-fixes' into maint
* dgud/msys2-fixes: erts: Detect and build on MSYS2 for windows
Diffstat (limited to 'otp_build')
-rwxr-xr-xotp_build4
1 files changed, 2 insertions, 2 deletions
diff --git a/otp_build b/otp_build
index e6eb048a14..ac99ced42a 100755
--- a/otp_build
+++ b/otp_build
@@ -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