changeset 2622:a013ce3462fc jdk8u252-b02

8193255: Root Certificates should be stored in text format and assembled at build time 8235142: JDK-8193255 backport broke bootstrap with JDK 10 Reviewed-by: sgehwolf
author andrew
date Mon, 03 Feb 2020 06:24:11 +0000
parents 08a43ae8a688
children 45fa68a141c0
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Wed Jan 29 07:02:27 2020 +0000
+++ b/common/autoconf/generated-configure.sh	Mon Feb 03 06:24:11 2020 +0000
@@ -4379,7 +4379,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1579517558
+DATE_WHEN_GENERATED=1580709484
 
 ###############################################################################
 #
@@ -19768,8 +19768,6 @@
 
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
 
 
--- a/common/autoconf/jdk-options.m4	Wed Jan 29 07:02:27 2020 +0000
+++ b/common/autoconf/jdk-options.m4	Mon Feb 03 06:24:11 2020 +0000
@@ -389,8 +389,6 @@
       [specify alternative cacerts file])])
   if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
-  else
-    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
   fi
   AC_SUBST(CACERTS_FILE)