common/autoconf/generated-configure.sh
Print this page
@@ -593,12 +593,12 @@
# include <unistd.h>
#endif"
ac_subst_vars='LTLIBOBJS
LIBOBJS
-CCACHE
USE_PRECOMPILED_HEADER
+CCACHE
SJAVAC_SERVER_DIR
ENABLE_SJAVAC
SJAVAC_SERVER_CORES
SJAVAC_SERVER_JAVA
JOBS
@@ -1025,13 +1025,13 @@
with_memory_size
with_jobs
with_sjavac_server_java
with_sjavac_server_cores
enable_sjavac
-enable_precompiled_headers
enable_ccache
with_ccache_dir
+enable_precompiled_headers
'
ac_precious_vars='build_alias
host_alias
target_alias
PKG_CONFIG
@@ -1690,15 +1690,15 @@
--disable-macosx-runtime-support
disable the use of MacOSX Java runtime support
framework [enabled]
--enable-sjavac use sjavac to do fast incremental compiles
[disabled]
+ --disable-ccache disable using ccache to speed up recompilations
+ [enabled]
--disable-precompiled-headers
disable using precompiled headers when compiling C++
[enabled]
- --disable-ccache disable using ccache to speed up recompilations
- [enabled]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-custom-make-dir use this directory for custom build/make files
@@ -3363,12 +3363,10 @@
-
-
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -3773,11 +3771,11 @@
# 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=1367502949
+DATE_WHEN_GENERATED=1369310526
###############################################################################
#
# Initialization / Boot-strapping
#
@@ -32871,52 +32869,10 @@
fi
-# Can the C/C++ compiler use precompiled headers?
-
-
-###############################################################################
-#
-# Can the C/C++ compiler use precompiled headers?
-#
-# Check whether --enable-precompiled-headers was given.
-if test "${enable_precompiled_headers+set}" = set; then :
- enableval=$enable_precompiled_headers; ENABLE_PRECOMPH=${enable_precompiled_headers}
-else
- ENABLE_PRECOMPH=yes
-fi
-
-
-USE_PRECOMPILED_HEADER=1
-if test "x$ENABLE_PRECOMPH" = xno; then
- USE_PRECOMPILED_HEADER=0
-fi
-
-if test "x$ENABLE_PRECOMPH" = xyes; then
- # Check that the compiler actually supports precomp headers.
- if test "x$GCC" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking that precompiled headers work" >&5
-$as_echo_n "checking that precompiled headers work... " >&6; }
- echo "int alfa();" > conftest.h
- $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5
- if test ! -f conftest.hpp.gch; then
- USE_PRECOMPILED_HEADER=0
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- fi
- rm -f conftest.h conftest.hpp.gch
- fi
-fi
-
-
-
-
# Setup use of ccache, if available
# Check whether --enable-ccache was given.
if test "${enable_ccache+set}" = set; then :
enableval=$enable_ccache; ENABLE_CCACHE=${enable_ccache}
@@ -32984,72 +32940,62 @@
if test "x$with_ccache_dir" != x; then
# When using a non home ccache directory, assume the use is to share ccache files
# with other users. Thus change the umask.
SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
fi
- CCACHE_FOUND=""
if test "x$CCACHE" != x; then
+ CCACHE_SLOPPINESS=time_macros
+ CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
- if test "x$CCACHE" != x; then
- CCACHE_FOUND="true"
- # Only use ccache if it is 3.1.4 or later, which supports
- # precompiled headers.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
-$as_echo_n "checking if ccache supports precompiled headers... " >&6; }
- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.[456789]) 2> /dev/null`
- if test "x$HAS_GOOD_CCACHE" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
-$as_echo "no, disabling ccache" >&6; }
- CCACHE=
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C-compiler supports ccache precompiled headers" >&5
-$as_echo_n "checking if C-compiler supports ccache precompiled headers... " >&6; }
- PUSHED_FLAGS="$CXXFLAGS"
- CXXFLAGS="-fpch-preprocess $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ if test "x$SET_CCACHE_DIR" != x; then
+ mkdir -p $with_ccache_dir > /dev/null 2>&1
+ chmod a+rwxs $with_ccache_dir > /dev/null 2>&1
+ fi
+ fi
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- CC_KNOWS_CCACHE_TRICK=yes
+# Can the C/C++ compiler use precompiled headers?
+
+
+###############################################################################
+#
+# Can the C/C++ compiler use precompiled headers?
+#
+# Check whether --enable-precompiled-headers was given.
+if test "${enable_precompiled_headers+set}" = set; then :
+ enableval=$enable_precompiled_headers; ENABLE_PRECOMPH=${enable_precompiled_headers}
else
- CC_KNOWS_CCACHE_TRICK=no
+ ENABLE_PRECOMPH=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$PUSHED_FLAGS"
- if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
+
+
+ USE_PRECOMPILED_HEADER=1
+ if test "x$ENABLE_PRECOMPH" = xno; then
+ USE_PRECOMPILED_HEADER=0
+ elif test "x$CCACHE" != x; then
+ # Disable precompiled header when using ccache as they don't work well together.
+ USE_PRECOMPILED_HEADER=0
+ elif test "x$ENABLE_PRECOMPH" = xyes; then
+ # Check that the compiler actually supports precomp headers.
+ if test "x$GCC" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that precompiled headers work" >&5
+$as_echo_n "checking that precompiled headers work... " >&6; }
+ echo "int alfa();" > conftest.h
+ $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5
+ if test ! -f conftest.hpp.gch; then
+ USE_PRECOMPILED_HEADER=0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccaching of precompiled headers" >&5
-$as_echo "no, disabling ccaching of precompiled headers" >&6; }
- CCACHE=
fi
+ rm -f conftest.h conftest.hpp.gch
fi
fi
- if test "x$CCACHE" != x; then
- CCACHE_SLOPPINESS=time_macros
- CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
- CCACHE_FLAGS=-fpch-preprocess
- if test "x$SET_CCACHE_DIR" != x; then
- mkdir -p $CCACHE_DIR > /dev/null 2>&1
- chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
- fi
- fi
-
- fi
###############################################################################
#
# And now the finish...
@@ -34408,17 +34354,12 @@
# Finally output some useful information to the user
# Finally output some useful information to the user
-if test "x$CCACHE_FOUND" != x; then
- if test "x$HAS_GOOD_CCACHE" = x; then
- CCACHE_STATUS="installed, but disabled (version older than 3.1.4)"
- CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading."
- else
+if test "x$CCACHE" != x; then
CCACHE_STATUS="installed and in use"
- fi
else
if test "x$GCC" = xyes; then
CCACHE_STATUS="not installed (consider installing)"
CCACHE_HELP_MSG="You do not have ccache installed. Try installing it."
else