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/make_version | |
| 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/make_version')
| -rwxr-xr-x | erts/emulator/utils/make_version | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/utils/make_version b/erts/emulator/utils/make_version index 3461dc1637..37bdff181a 100755 --- a/erts/emulator/utils/make_version +++ b/erts/emulator/utils/make_version @@ -59,7 +59,11 @@ print FILE <<EOF; #define ERLANG_OTP_RELEASE "$release" #define ERLANG_OTP_VERSION "$otp_version" #define ERLANG_VERSION "$version" -#define ERLANG_COMPILE_DATE "$time_str" +#if ERTS_SAVED_COMPILE_TIME +# define ERLANG_COMPILE_DATE "$time_str" +#else +# define ERLANG_COMPILE_DATE "" +#endif #define ERLANG_ARCHITECTURE "$architecture" EOF |