jdk-sandbox: comparison common/autoconf/generated-configure.sh

equal deleted inserted replaced

-:bfb0c4f25f0f
+:79641c886929
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 CFLAGS_CCACHE
 CCACHE
 USE_PRECOMPILED_HEADER
-SJAVAC_SERVER_DIR
 ENABLE_SJAVAC
 SJAVAC_SERVER_JAVA_FLAGS
 SJAVAC_SERVER_JAVA
 JAVA_TOOL_FLAGS_SMALL
 JAVA_FLAGS_SMALL
 CHECK_TOOLSDIR_MAKE
 CHECK_TOOLSDIR_GMAKE
 CHECK_MAKE
 CHECK_GMAKE
 PKGHANDLER
+CONFIGURESUPPORT_OUTPUTDIR
 OUTPUT_ROOT
 CONF_NAME
 SPEC
 SDKROOT
 XCODEBUILD
 # definitions. It is replaced with custom functionality when building
 # custom sources.
 #CUSTOM_AUTOCONF_INCLUDE
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1428017006
+DATE_WHEN_GENERATED=1428676283
 ###############################################################################
 #
 # Initialization / Boot-strapping
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: in build directory with custom name" >&5
 $as_echo "in build directory with custom name" >&6; }
 fi
 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
 $MKDIR -p "$OUTPUT_ROOT"
+CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support"
+$MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
 if test ! -d "$OUTPUT_ROOT"; then
 as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
 fi
 else
 # We are running configure from outside of the src dir.
 SPEC=$OUTPUT_ROOT/spec.gmk
 CONF_NAME=$CONF_NAME
 OUTPUT_ROOT=$OUTPUT_ROOT
 # The spec.gmk file contains all variables for the make system.
 ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
 # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
 { $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
 $as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
 # We need to create a couple of temporary files.
-VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
+VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
 $MKDIR -p $VS_ENV_TMP_DIR
 # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
 # Instead create a shell script which will set the relevant variables when run.
 WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
 FIXPATH=
 if test "x$OPENJDK_BUILD_OS" = xwindows; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
 $as_echo_n "checking if fixpath can be created... " >&6; }
 FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
-FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
+FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
+FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
 if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
-FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC`
-FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN`
 # Important to keep the .exe suffix on Cygwin for Hotspot makefiles
-FIXPATH="$OUTPUT_ROOT/fixpath.exe -c"
+FIXPATH="$FIXPATH_BIN -c"
 elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then
-FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC`
-FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN`
 # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line
 # @ was chosen as separator to minimize risk of other tools messing around with it
-all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
+all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" \
+| tr ' ' '\n' | grep '^/./' | sort | uniq`
 fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
+FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
-FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
+fi
-fi
+FIXPATH_SRC_W="$FIXPATH_SRC"
-rm -f $OUTPUT_ROOT/fixpath*
+FIXPATH_BIN_W="$FIXPATH_BIN"
-cd $OUTPUT_ROOT
-$CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
+unix_path="$FIXPATH_SRC_W"
+if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+windows_path=`$CYGPATH -m "$unix_path"`
+FIXPATH_SRC_W="$windows_path"
+elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+windows_path=`cmd //c echo $unix_path`
+FIXPATH_SRC_W="$windows_path"
+fi
+unix_path="$FIXPATH_BIN_W"
+if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+windows_path=`$CYGPATH -m "$unix_path"`
+FIXPATH_BIN_W="$windows_path"
+elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+windows_path=`cmd //c echo $unix_path`
+FIXPATH_BIN_W="$windows_path"
+fi
+$RM -rf $FIXPATH_BIN $FIXPATH_DIR
+$MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
+cd $FIXPATH_DIR
+$CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
 cd $CURDIR
-if test ! -x $OUTPUT_ROOT/fixpath.exe; then
+if test ! -x $FIXPATH_BIN; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-cat $OUTPUT_ROOT/fixpath1.log
+cat $FIXPATH_DIR/fixpath1.log
-as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5
+as_fn_error $? "Could not create $FIXPATH_BIN" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5
 $as_echo_n "checking if fixpath.exe works... " >&6; }
-cd $OUTPUT_ROOT
+cd $FIXPATH_DIR
-$FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
+$FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
+> $FIXPATH_DIR/fixpath2.log 2>&1
 cd $CURDIR
-if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
+if test ! -x $FIXPATH_DIR/fixpath2.exe; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-cat $OUTPUT_ROOT/fixpath2.log
+cat $FIXPATH_DIR/fixpath2.log
 as_fn_error $? "fixpath did not work!" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
 fi
 $as_echo_n "checking whether to use sjavac... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_SJAVAC" >&5
 $as_echo "$ENABLE_SJAVAC" >&6; }
-if test "x$ENABLE_SJAVAC" = xyes; then
-SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
-else
-SJAVAC_SERVER_DIR=
-fi
 # Can the C/C++ compiler use precompiled headers?
 ###############################################################################
 # At the end, call the custom hook. (Dummy macro if no custom sources available)
 # We're messing a bit with internal autoconf variables to put the config.status
 # in the output directory instead of the current directory.
-CONFIG_STATUS="$OUTPUT_ROOT/config.status"
+CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status"
 # Create the actual output files. Now the main work of configure is done.
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # Try to move the config.log file to the output directory.
 if test -e ./config.log; then
-$MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
+$MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
 fi
 # Make the compare script executable
 $CHMOD +x $OUTPUT_ROOT/compare.sh

changeset 29790	79641c886929
parent 29675	1d3f03251645
child 29848	13db4da8a496