summaryrefslogtreecommitdiff
path: root/otp_build
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2015-09-28 12:34:53 +0200
committerDan Gudmundsson <dgud@erlang.org>2015-10-22 14:17:57 +0200
commit4a9f688b804688ff95e256d3412ca932b9972d8a (patch)
treee3691d22889979a0c5835ab5ca4ef0efb198f73f /otp_build
parent1523be48ab4071b158412f4b06fe9c8d6ba3e73c (diff)
downloaderlang-4a9f688b804688ff95e256d3412ca932b9972d8a.tar.gz
erts: Detect and build on MSYS2 for windows
Allow building win32 on MSYS2. Avoid msys2 path conversion which does not work. And print the real windows command when something fails.
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