stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8010785: JDK 8 build on Linux fails with new build mechanism

Browse Source 
Reviewed-by: dholmes, tbell
This commit is contained in:
Erik Joelsson 2013-06-11 13:25:21 +02:00
parent c6a5dcd8bf
commit fcb2ec8d6f
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/autoconf/generated-configure.sh
View File

@ -3782,7 +3782,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # 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 @@ fi
if test "x$with_cacerts_file" != x; then if test "x$with_cacerts_file" != x; then
CACERTS_FILE=$with_cacerts_file CACERTS_FILE=$with_cacerts_file
else else
if test "x$OPENJDK" = "xtrue"; then CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
else
CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
fi
fi fi

6
common/autoconf/jdk-options.m4
View File

@ -351,11 +351,7 @@ AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
if test "x$with_cacerts_file" != x; then if test "x$with_cacerts_file" != x; then
CACERTS_FILE=$with_cacerts_file CACERTS_FILE=$with_cacerts_file
else else
if test "x$OPENJDK" = "xtrue"; then CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
else
CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal
fi
fi fi
AC_SUBST(CACERTS_FILE) AC_SUBST(CACERTS_FILE)