1.1 --- a/common/autoconf/generated-configure.sh Wed Oct 30 17:31:01 2013 +0000
1.2 +++ b/common/autoconf/generated-configure.sh Wed Oct 30 13:41:36 2013 -0700
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 @@ -7149,6 +7150,13 @@
1.12 fi
1.13
1.14
1.15 + if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.16 + OPENJDK_TARGET_OS_EXPORT_DIR=macosx
1.17 + else
1.18 + OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
1.19 + fi
1.20 +
1.21 +
1.22 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.23 A_LP64="LP64:="
1.24 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
1.25 @@ -29638,7 +29646,7 @@
1.26 -I${JDK_OUTPUTDIR}/include \
1.27 -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
1.28 -I${JDK_TOPDIR}/src/share/javavm/export \
1.29 - -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/javavm/export \
1.30 + -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
1.31 -I${JDK_TOPDIR}/src/share/native/common \
1.32 -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
1.33
1.34 @@ -29905,11 +29913,11 @@
1.35 elif test "x$enable_debug_symbols" = "xno"; then
1.36 ENABLE_DEBUG_SYMBOLS=false
1.37 else
1.38 - # Default is on if objcopy is found
1.39 - if test "x$OBJCOPY" != x; then
1.40 - ENABLE_DEBUG_SYMBOLS=true
1.41 - # MacOS X and Windows don't use objcopy but default is on for those OSes
1.42 - elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.43 + # Default is on if objcopy is found
1.44 + if test "x$OBJCOPY" != x; then
1.45 + ENABLE_DEBUG_SYMBOLS=true
1.46 + # MacOS X and Windows don't use objcopy but default is on for those OSes
1.47 + elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
1.48 ENABLE_DEBUG_SYMBOLS=true
1.49 else
1.50 ENABLE_DEBUG_SYMBOLS=false
1.51 @@ -34245,10 +34253,10 @@
1.52 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1.53
1.54 PREV_CXXCFLAGS="$CXXFLAGS"
1.55 - PREV_LDFLAGS="$LDFLAGS"
1.56 + PREV_LIBS="$LIBS"
1.57 PREV_CXX="$CXX"
1.58 CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
1.59 - LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
1.60 + LIBS="$LIBS $FREETYPE_LIBS"
1.61 CXX="$FIXPATH $CXX"
1.62 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.63 /* end confdefs.h. */
1.64 @@ -34315,7 +34323,7 @@
1.65 rm -f core conftest.err conftest.$ac_objext \
1.66 conftest$ac_exeext conftest.$ac_ext
1.67 CXXCFLAGS="$PREV_CXXFLAGS"
1.68 - LDFLAGS="$PREV_LDFLAGS"
1.69 + LIBS="$PREV_LIBS"
1.70 CXX="$PREV_CXX"
1.71 ac_ext=cpp
1.72 ac_cpp='$CXXCPP $CPPFLAGS'
