diff options
author | Rickard Green <[email protected]> | 2015-09-09 18:19:46 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2015-09-09 18:19:46 +0200 |
commit | 962797287a5e7a93713a0ce9d60cdc92098ff772 (patch) | |
tree | ce4bc93172d047c54c6338832bd3d492f9eb8173 /erts/emulator/utils/mkver.c | |
parent | ddd1acec5100f5bcc96b29f09b80edd717746edf (diff) | |
parent | 79da6e851e98729d103979ba466d47f4fa4421b2 (diff) | |
download | otp-962797287a5e7a93713a0ce9d60cdc92098ff772.tar.gz otp-962797287a5e7a93713a0ce9d60cdc92098ff772.tar.bz2 otp-962797287a5e7a93713a0ce9d60cdc92098ff772.zip |
Merge branch 'maint'
* maint:
Add configure switch --disable-saved-compile-time
Fix ethread events with timeout
Improve choice of clock sources at build time
Diffstat (limited to 'erts/emulator/utils/mkver.c')
-rw-r--r-- | erts/emulator/utils/mkver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/utils/mkver.c b/erts/emulator/utils/mkver.c index 96cd315a95..6641873712 100644 --- a/erts/emulator/utils/mkver.c +++ b/erts/emulator/utils/mkver.c @@ -35,8 +35,10 @@ int argc; char** argv; { FILE *file; +#if ERTS_SAVED_COMPILE_TIME time_t now; - char *cnow; +#endif + char *cnow = ""; if (argc != 2) { fprintf(stderr, "usage: mkver version\n"); @@ -48,9 +50,11 @@ char** argv; exit(1); } +#if ERTS_SAVED_COMPILE_TIME time(&now); cnow = ctime(&now); cnow[24] = '\0'; /* tidelipom */ +#endif fprintf(file, "/* This file was created by mkver -- don't modify.*/\n"); fprintf(file, "#define ERLANG_VERSION \"%s\"\n", argv[1]); fprintf(file, "#define ERLANG_COMPILE_DATE \"%s\"\n", cnow); |