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 /erts/etc/win32/msys_tools/vc/rc.sh | |
| 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 '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 |