1.1 --- a/common/autoconf/generated-configure.sh Thu Oct 24 10:43:35 2013 +0200
1.2 +++ b/common/autoconf/generated-configure.sh Thu Oct 24 20:45:43 2013 -0400
1.3 @@ -869,6 +869,7 @@
1.4 ZERO_ARCHDEF
1.5 DEFINE_CROSS_COMPILE_ARCH
1.6 LP64
1.7 +OPENJDK_TARGET_OS_EXPORT_DIR
1.8 OPENJDK_TARGET_OS_API_DIR
1.9 OPENJDK_TARGET_CPU_JLI_CFLAGS
1.10 OPENJDK_TARGET_CPU_OSARCH
1.11 @@ -3864,7 +3865,7 @@
1.12 #CUSTOM_AUTOCONF_INCLUDE
1.13
1.14 # Do not change or remove the following line, it is needed for consistency checks:
1.15 -DATE_WHEN_GENERATED=1382540536
1.16 +DATE_WHEN_GENERATED=1382659005
1.17
1.18 ###############################################################################
1.19 #
1.20 @@ -7149,6 +7150,13 @@
1.21 fi
1.22
1.23
1.24 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.25 + OPENJDK_TARGET_OS_EXPORT_DIR=macosx
1.26 + else
1.27 + OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
1.28 + fi
1.29 +
1.30 +
1.31 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.32 A_LP64="LP64:="
1.33 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
1.34 @@ -29638,7 +29646,7 @@
1.35 -I${JDK_OUTPUTDIR}/include \
1.36 -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
1.37 -I${JDK_TOPDIR}/src/share/javavm/export \
1.38 - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \
1.39 + -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
1.40 -I${JDK_TOPDIR}/src/share/native/common \
1.41 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
1.42
