aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-03-20 11:43:18 +0100
committerGustav Simonsson <[email protected]>2012-03-20 11:43:24 +0100
commitee94b8170bf475cba219da912a385c3f87046ae5 (patch)
treecfde43a8394dddb92323e7edfda193e740dbccb9 /erts
parent46dd06a64dc5e14aec5921b293135713baa64059 (diff)
parenta50b2858ab9e0dd7cc2898696a5ab119a6b73a14 (diff)
downloadotp-ee94b8170bf475cba219da912a385c3f87046ae5.tar.gz
otp-ee94b8170bf475cba219da912a385c3f87046ae5.tar.bz2
otp-ee94b8170bf475cba219da912a385c3f87046ae5.zip
Merge branch 'dc/dch-fix-win32-escript' into maint
* dc/dch-fix-win32-escript: add escript win32 alternative invocation (thanks Pierre Rouleau) OTP-9997
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/common/escript.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 6ed79c91e3..e70c95b67c 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -377,7 +377,8 @@ main(int argc, char** argv)
last_opt = argv;
#ifdef __WIN32__
- if (_stricmp(basename, "escript.exe") == 0) {
+ if ( (_stricmp(basename, "escript.exe") == 0)
+ ||(_stricmp(basename, "escript") == 0)) {
#else
if (strcmp(basename, "escript") == 0) {
#endif