Mercurial > hg > openjdk > lambda
changeset 963:3c48e11c3901
8016096: [macosx] jawt_md.h shipped with jdk is outdated
Summary: Revised build system and added platform specific headers for Mac OS X
Reviewed-by: ihse, erikj
Contributed-by: david.dehaven@oracle.com
| author | dholmes |
|---|---|
| date | Thu, 24 Oct 2013 20:45:43 -0400 |
| parents | b098ee22aa97 |
| children | 72ef61df77e5 |
| files | common/autoconf/generated-configure.sh common/autoconf/platform.m4 common/autoconf/spec.gmk.in common/autoconf/toolchain.m4 |
| diffstat | 4 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Oct 24 10:43:35 2013 +0200 +++ b/common/autoconf/generated-configure.sh Thu Oct 24 20:45:43 2013 -0400 @@ -869,6 +869,7 @@ ZERO_ARCHDEF DEFINE_CROSS_COMPILE_ARCH LP64 +OPENJDK_TARGET_OS_EXPORT_DIR OPENJDK_TARGET_OS_API_DIR OPENJDK_TARGET_CPU_JLI_CFLAGS OPENJDK_TARGET_CPU_OSARCH @@ -3864,7 +3865,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1382540536 +DATE_WHEN_GENERATED=1382659005 ############################################################################### # @@ -7149,6 +7150,13 @@ fi + if test "x$OPENJDK_TARGET_OS" = xmacosx; then + OPENJDK_TARGET_OS_EXPORT_DIR=macosx + else + OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR} + fi + + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then A_LP64="LP64:=" # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in @@ -29638,7 +29646,7 @@ -I${JDK_OUTPUTDIR}/include \ -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \ -I${JDK_TOPDIR}/src/share/javavm/export \ - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \ + -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \ -I${JDK_TOPDIR}/src/share/native/common \ -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
--- a/common/autoconf/platform.m4 Thu Oct 24 10:43:35 2013 +0200 +++ b/common/autoconf/platform.m4 Thu Oct 24 20:45:43 2013 -0400 @@ -327,6 +327,13 @@ fi AC_SUBST(OPENJDK_TARGET_OS_API_DIR) + if test "x$OPENJDK_TARGET_OS" = xmacosx; then + OPENJDK_TARGET_OS_EXPORT_DIR=macosx + else + OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR} + fi + AC_SUBST(OPENJDK_TARGET_OS_EXPORT_DIR) + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then A_LP64="LP64:=" # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
--- a/common/autoconf/spec.gmk.in Thu Oct 24 10:43:35 2013 +0200 +++ b/common/autoconf/spec.gmk.in Thu Oct 24 20:45:43 2013 -0400 @@ -92,6 +92,7 @@ OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@ OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@ OPENJDK_TARGET_OS_API_DIR:=@OPENJDK_TARGET_OS_API_DIR@ +OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@ # We are building on this build system. # When not cross-compiling, it is the same as the target.
--- a/common/autoconf/toolchain.m4 Thu Oct 24 10:43:35 2013 +0200 +++ b/common/autoconf/toolchain.m4 Thu Oct 24 20:45:43 2013 -0400 @@ -942,7 +942,7 @@ -I${JDK_OUTPUTDIR}/include \ -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \ -I${JDK_TOPDIR}/src/share/javavm/export \ - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \ + -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \ -I${JDK_TOPDIR}/src/share/native/common \ -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"