Add configure switch --disable-saved-compile-time

6 files changed, 26 insertions, 3 deletions

diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index 837e6cbd76..14bb265829 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -406,6 +406,8 @@ Some of the available `configure` options are:
     time source with elapsed time during suspend.
 *   `--disable-prefer-elapsed-monotonic-time-during-suspend` - Do not prefer an OS
     monotonic time source with elapsed time during suspend.
+*   `--disable-saved-compile-time` - Disable saving of compile date and time
+    in the emulator binary.
 *   `--enable-dirty-schedulers` - Enable the **experimental** dirty schedulers
     functionality. Note that the dirty schedulers functionality is experimental,
     and **not supported**. This functionality **will** be subject to backward
diff --git a/erts/configure.in b/erts/configure.in
index 22ca7ec17d..4fb725ff00 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -342,6 +342,15 @@ AS_HELP_STRING([--enable-systemd], [enable systemd support in epmd]),
 [],
 [enable_systemd=no])
 
+AC_ARG_ENABLE(saved-compile-time,
+AS_HELP_STRING([--disable-saved-compile-time], [disable saved compile time]),
+[ case "$enableval" in
+    no) save_compile_time=0 ;;
+    *)  save_compile_time=1 ;;
+  esac ], save_compile_time=1)
+
+AC_DEFINE_UNQUOTED(ERTS_SAVED_COMPILE_TIME, $save_compile_time, [Save compile time?])
+
 dnl Magic test for clearcase.
 OTP_RELEASE=
 if test "${ERLANG_COMMERCIAL_BUILD}" != ""; then
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 64c8bc5e58..4ce9d24479 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -536,7 +536,9 @@ do_break(void)
 	    erts_printf("Erlang (%s) emulator version "
 		       ERLANG_VERSION "\n",
 		       EMULATOR);
+#if ERTS_SAVED_COMPILE_TIME
 	    erts_printf("Compiled on " ERLANG_COMPILE_DATE "\n");
+#endif
 	    return;
 	case 'd':
 	    distribution_info(ERTS_PRINT_STDOUT, NULL);
@@ -774,7 +776,9 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
     }
     erts_fdprintf(fd, "System version: ");
     erts_print_system_version(fd, NULL, NULL);
+#if ERTS_SAVED_COMPILE_TIME
     erts_fdprintf(fd, "%s\n", "Compiled: " ERLANG_COMPILE_DATE);
+#endif
 
     erts_fdprintf(fd, "Taints: ");
     erts_print_nif_taints(fd, NULL);
diff --git a/erts/emulator/utils/make_alloc_types b/erts/emulator/utils/make_alloc_types
index 88f537ea09..925b9d5810 100755
--- a/erts/emulator/utils/make_alloc_types
+++ b/erts/emulator/utils/make_alloc_types
@@ -246,7 +246,7 @@ print DST "
 
 print DST "#define ERTS_ALC_C_MIN ($c_no)\n\n";
 
-foreach my $c (keys(%c_tab)) {
+foreach my $c (sort keys(%c_tab)) {
   push(@c_order, $c);
   set_number($c_tab{$c}, $c_no);
   print DST "#define ERTS_ALC_C_$c  ($c_no)\n";
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
 
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);