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/emu_cc.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/emu_cc.sh')
| -rw-r--r-- | erts/etc/win32/msys_tools/vc/emu_cc.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/etc/win32/msys_tools/vc/emu_cc.sh b/erts/etc/win32/msys_tools/vc/emu_cc.sh index 01f75b2468..10d59214ea 100644 --- a/erts/etc/win32/msys_tools/vc/emu_cc.sh +++ b/erts/etc/win32/msys_tools/vc/emu_cc.sh @@ -29,6 +29,7 @@ WTOOLDIR0=`win2msys_path.sh "$TOOLDIR"` WTOOLDIR=`cmd //C echo $WTOOLDIR0` # Do primitive 'make' newer_exe=`find $TOOLDIR -newer $COFFIX.c -name coffix.exe -print` +export MSYS2_ARG_CONV_EXCL="-FeC" if [ -z $newer_exe ]; then echo recompiling $COFFIX.exe cl.exe -Fe${WTOOLDIR}/coffix.exe ${WTOOLDIR}/coffix.c |