changeset 732:3cbcc2b6ba41

8010785: JDK 8 build on Linux fails with new build mechanism Reviewed-by: dholmes, tbell
author erikj
date Tue, 11 Jun 2013 13:25:21 +0200
parents 198d25db45da
children 50d2bde060f2
files common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 2 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Jun 11 13:08:02 2013 +0200
+++ b/common/autoconf/generated-configure.sh	Tue Jun 11 13:25:21 2013 +0200
@@ -3782,7 +3782,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1370948811
+DATE_WHEN_GENERATED=1370949244
 
 ###############################################################################
 #
@@ -10782,11 +10782,7 @@
 if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
 else
-    if test "x$OPENJDK" = "xtrue"; then
-        CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
-    else
-        CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
-    fi
+    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
 fi
 
 
--- a/common/autoconf/jdk-options.m4	Tue Jun 11 13:08:02 2013 +0200
+++ b/common/autoconf/jdk-options.m4	Tue Jun 11 13:25:21 2013 +0200
@@ -351,11 +351,7 @@
 if test "x$with_cacerts_file" != x; then
     CACERTS_FILE=$with_cacerts_file
 else
-    if test "x$OPENJDK" = "xtrue"; then
-        CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
-    else
-        CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
-    fi
+    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
 fi
 AC_SUBST(CACERTS_FILE)