diff options
| author | Rickard Green <[email protected]> | 2014-01-13 20:38:24 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-01-13 20:38:24 +0100 |
| commit | fc8cc0057b1f492f359d4f644fe93fdbc75074e8 (patch) | |
| tree | 63f496f61ea5e63605c5346bd267a9d0f312a96b /erts/etc | |
| parent | 589eba64f9c1fdef8a717c930aa8a51c47291a53 (diff) | |
| parent | 47979206defa9429458e419b691138ab1b519833 (diff) | |
| download | otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.gz otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.tar.bz2 otp-fc8cc0057b1f492f359d4f644fe93fdbc75074e8.zip | |
Merge branch 'rickard/otp-17-vsn-fix'
* rickard/otp-17-vsn-fix:
Fix issues with new versioning
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 1d7811d570..c30203c632 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -1972,35 +1972,8 @@ get_file_args(char *filename, argv_buf *abp, argv_buf *xabp) } static void -write_erl_otp_flags(char *bufp) -{ - /* ERL_OTP<MAJOR-VSN>_FLAGS */ - int ix = 0; - char *otp_p; - char otp[] = OTP_SYSTEM_VERSION; - - bufp[ix++] = 'E'; - bufp[ix++] = 'R'; - bufp[ix++] = 'L'; - bufp[ix++] = '_'; - bufp[ix++] = 'O'; - bufp[ix++] = 'T'; - bufp[ix++] = 'P'; - for (otp_p = &otp[0]; '0' <= *otp_p && *otp_p <= '9'; otp_p++) - bufp[ix++] = *otp_p; - bufp[ix++] = '_'; - bufp[ix++] = 'F'; - bufp[ix++] = 'L'; - bufp[ix++] = 'A'; - bufp[ix++] = 'G'; - bufp[ix++] = 'S'; - bufp[ix] = '\0'; -} - -static void initial_argv_massage(int *argc, char ***argv) { - char erl_otp_flags_buf[] = "ERL_OTP" OTP_SYSTEM_VERSION "_FLAGS"; argv_buf ab = {0}, xab = {0}; int ix, vix, ac; char **av; @@ -2016,8 +1989,7 @@ initial_argv_massage(int *argc, char ***argv) vix = 0; - write_erl_otp_flags(erl_otp_flags_buf); - av = build_args_from_env(erl_otp_flags_buf); + av = build_args_from_env("ERL_OTP" OTP_SYSTEM_VERSION "_FLAGS"); if (av) avv[vix++].argv = av; |