common/autoconf/generated-configure.sh

changeset 872
3c48e11c3901
parent 869
6ba4c7cb623e
child 873
72ef61df77e5
equal deleted inserted replaced
871:b098ee22aa97 872:3c48e11c3901
867 PATH_SEP 867 PATH_SEP
868 SRC_ROOT 868 SRC_ROOT
869 ZERO_ARCHDEF 869 ZERO_ARCHDEF
870 DEFINE_CROSS_COMPILE_ARCH 870 DEFINE_CROSS_COMPILE_ARCH
871 LP64 871 LP64
872 OPENJDK_TARGET_OS_EXPORT_DIR
872 OPENJDK_TARGET_OS_API_DIR 873 OPENJDK_TARGET_OS_API_DIR
873 OPENJDK_TARGET_CPU_JLI_CFLAGS 874 OPENJDK_TARGET_CPU_JLI_CFLAGS
874 OPENJDK_TARGET_CPU_OSARCH 875 OPENJDK_TARGET_CPU_OSARCH
875 OPENJDK_TARGET_CPU_ISADIR 876 OPENJDK_TARGET_CPU_ISADIR
876 OPENJDK_TARGET_CPU_LIBDIR 877 OPENJDK_TARGET_CPU_LIBDIR
3862 # definitions. It is replaced with custom functionality when building 3863 # definitions. It is replaced with custom functionality when building
3863 # custom sources. 3864 # custom sources.
3864 #CUSTOM_AUTOCONF_INCLUDE 3865 #CUSTOM_AUTOCONF_INCLUDE
3865 3866
3866 # Do not change or remove the following line, it is needed for consistency checks: 3867 # Do not change or remove the following line, it is needed for consistency checks:
3867 DATE_WHEN_GENERATED=1382540536 3868 DATE_WHEN_GENERATED=1382659005
3868 3869
3869 ############################################################################### 3870 ###############################################################################
3870 # 3871 #
3871 # Initialization / Boot-strapping 3872 # Initialization / Boot-strapping
3872 # 3873 #
7147 if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then 7148 if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
7148 OPENJDK_TARGET_OS_API_DIR="windows" 7149 OPENJDK_TARGET_OS_API_DIR="windows"
7149 fi 7150 fi
7150 7151
7151 7152
7153 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
7154 OPENJDK_TARGET_OS_EXPORT_DIR=macosx
7155 else
7156 OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
7157 fi
7158
7159
7152 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 7160 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
7153 A_LP64="LP64:=" 7161 A_LP64="LP64:="
7154 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in 7162 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
7155 # unpack200.exe 7163 # unpack200.exe
7156 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then 7164 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
29636 29644
29637 CCXXFLAGS_JDK="$CCXXFLAGS_JDK \ 29645 CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
29638 -I${JDK_OUTPUTDIR}/include \ 29646 -I${JDK_OUTPUTDIR}/include \
29639 -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \ 29647 -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
29640 -I${JDK_TOPDIR}/src/share/javavm/export \ 29648 -I${JDK_TOPDIR}/src/share/javavm/export \
29641 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \ 29649 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
29642 -I${JDK_TOPDIR}/src/share/native/common \ 29650 -I${JDK_TOPDIR}/src/share/native/common \
29643 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common" 29651 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
29644 29652
29645 # The shared libraries are compiled using the picflag. 29653 # The shared libraries are compiled using the picflag.
29646 CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA" 29654 CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"

mercurial