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

3 files changed, 11 insertions, 3 deletions

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);