diff options
| author | Dan Gudmundsson <[email protected]> | 2015-09-28 12:34:53 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-10-22 14:17:57 +0200 |
| commit | 4a9f688b804688ff95e256d3412ca932b9972d8a (patch) | |
| tree | e3691d22889979a0c5835ab5ca4ef0efb198f73f /erts/etc/win32/msys_tools/vc/rc.sh | |
| parent | 1523be48ab4071b158412f4b06fe9c8d6ba3e73c (diff) | |
| download | otp-4a9f688b804688ff95e256d3412ca932b9972d8a.tar.gz otp-4a9f688b804688ff95e256d3412ca932b9972d8a.tar.bz2 otp-4a9f688b804688ff95e256d3412ca932b9972d8a.zip | |
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 'erts/etc/win32/msys_tools/vc/rc.sh')
| -rw-r--r-- | erts/etc/win32/msys_tools/vc/rc.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/etc/win32/msys_tools/vc/rc.sh b/erts/etc/win32/msys_tools/vc/rc.sh index 1b3b1c85bd..1f8ade17cb 100644 --- a/erts/etc/win32/msys_tools/vc/rc.sh +++ b/erts/etc/win32/msys_tools/vc/rc.sh @@ -79,9 +79,14 @@ if [ "X$RC_SH_DEBUG_LOG" != "X" ]; then echo rc.sh "$SAVE" >>$RC_SH_DEBUG_LOG echo rc.exe $CMD >>$RC_SH_DEBUG_LOG fi +# MSYS2 (currently) converts the paths wrong, avoid it +export MSYS2_ARG_CONV_EXCL=-Fo eval $RCC "$CMD" >/tmp/rc.exe.${p}.1 2>/tmp/rc.exe.${p}.2 RES=$? -tail +2 /tmp/rc.exe.${p}.2 >&2 +if [ $RES != 0 ]; then + echo Failed: $RCC "$CMD" +fi +tail -n +2 /tmp/rc.exe.${p}.2 >&2 cat /tmp/rc.exe.${p}.1 rm -f /tmp/rc.exe.${p}.2 /tmp/rc.exe.${p}.1 exit $RES |