mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-02-23 03:59:16 +08:00
acinclude.m4 (GLIBCXX_CONFIGURE): Unprecious CC and CFLAGS when calling AC_PROG_CC.
2003-08-11 Phil Edwards <pme@gcc.gnu.org> * acinclude.m4 (GLIBCXX_CONFIGURE): Unprecious CC and CFLAGS when calling AC_PROG_CC. * aclocal.m4, configure: Regenerate. From-SVN: r70319
This commit is contained in:
Phil Edwards
parent
fbe057bb8b
commit
f6dda6511a
@ -1,3 +1,9 @@
|
||||
2003-08-11 Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
* acinclude.m4 (GLIBCXX_CONFIGURE): Unprecious CC and CFLAGS
|
||||
when calling AC_PROG_CC.
|
||||
* aclocal.m4, configure: Regenerate.
|
||||
|
||||
2003-08-11 Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
* acinclude.m4: Properly quote variable which will be expanded
|
||||
|
||||
@ -88,8 +88,6 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
|
||||
AC_HELP_STRING([--with-newlib],
|
||||
[assume newlib as a system C library]))
|
||||
|
||||
AC_PROG_CC
|
||||
|
||||
# We're almost certainly being configured before anything else which uses
|
||||
# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that
|
||||
# we not cache the value of CXX that we "discover" here, because it's set
|
||||
@ -102,7 +100,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
|
||||
# wrong (non-multilib-adjusted) value will be used in multilibs. This
|
||||
# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side
|
||||
# effect, CXXFLAGS is no longer automagically subst'd, so we have to do
|
||||
# that ourselves.
|
||||
# that ourselves. Un-preciousing AC_PROG_CC also affects CC and CFLAGS.
|
||||
#
|
||||
# -fno-builtin must be present here so that a non-conflicting form of
|
||||
# std::exit can be guessed by AC_PROG_CXX, and used in later tests.
|
||||
@ -112,9 +110,11 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
|
||||
m4_define([_AC_ARG_VAR_PRECIOUS],[])
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -fno-builtin"
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CXXFLAGS)
|
||||
|
||||
# For directory versioning (e.g., headers) and other variables.
|
||||
|
||||
6
libstdc++-v3/aclocal.m4
vendored
6
libstdc++-v3/aclocal.m4
vendored
@ -101,8 +101,6 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
|
||||
AC_HELP_STRING([--with-newlib],
|
||||
[assume newlib as a system C library]))
|
||||
|
||||
AC_PROG_CC
|
||||
|
||||
# We're almost certainly being configured before anything else which uses
|
||||
# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that
|
||||
# we not cache the value of CXX that we "discover" here, because it's set
|
||||
@ -115,7 +113,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
|
||||
# wrong (non-multilib-adjusted) value will be used in multilibs. This
|
||||
# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side
|
||||
# effect, CXXFLAGS is no longer automagically subst'd, so we have to do
|
||||
# that ourselves.
|
||||
# that ourselves. Un-preciousing AC_PROG_CC also affects CC and CFLAGS.
|
||||
#
|
||||
# -fno-builtin must be present here so that a non-conflicting form of
|
||||
# std::exit can be guessed by AC_PROG_CXX, and used in later tests.
|
||||
@ -125,9 +123,11 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
|
||||
m4_define([_AC_ARG_VAR_PRECIOUS],[])
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -fno-builtin"
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
CXXFLAGS="$save_CXXFLAGS"
|
||||
m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(CXXFLAGS)
|
||||
|
||||
# For directory versioning (e.g., headers) and other variables.
|
||||
|
||||
77
libstdc++-v3/configure
vendored
77
libstdc++-v3/configure
vendored
@ -308,7 +308,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libtool_VERSION multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot glibcxx_builddir glibcxx_srcdir toplevel_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CXXFLAGS LN_S AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOL CXXCPP enable_shared enable_static LIBUNWIND_FLAG GLIBCXX_BUILD_PCH_TRUE GLIBCXX_BUILD_PCH_FALSE glibcxx_PCHFLAGS CSTDIO_H FPOS_H BASIC_FILE_H BASIC_FILE_CC CPP EGREP check_msgfmt glibcxx_MOFILES glibcxx_POFILES glibcxx_localedir USE_NLS CLOCALE_H CCODECVT_H CMESSAGES_H CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_H CTIME_CC CLOCALE_CC CLOCALE_INTERNAL_H C_INCLUDE_DIR GLIBCXX_C_HEADERS_C_TRUE GLIBCXX_C_HEADERS_C_FALSE GLIBCXX_C_HEADERS_C_STD_TRUE GLIBCXX_C_HEADERS_C_STD_FALSE GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE glibcxx_thread_h DEBUG_FLAGS GLIBCXX_BUILD_DEBUG_TRUE GLIBCXX_BUILD_DEBUG_FALSE EXTRA_CXX_FLAGS SECTION_FLAGS SECTION_LDFLAGS OPT_LDFLAGS LIBMATHOBJS WERROR SYMVER_MAP port_specific_symbol_files GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE baseline_dir GLIBCXX_TEST_WCHAR_T_TRUE GLIBCXX_TEST_WCHAR_T_FALSE GLIBCXX_TEST_ABI_TRUE GLIBCXX_TEST_ABI_FALSE ATOMICITY_INC_SRCDIR FPOS_INC_SRCDIR OS_INC_SRCDIR CANADIAN_TRUE CANADIAN_FALSE GLIBCXX_BUILD_LIBMATH_TRUE GLIBCXX_BUILD_LIBMATH_FALSE glibcxx_prefixdir gxx_include_dir glibcxx_toolexecdir glibcxx_toolexeclibdir GLIBCXX_INCLUDES TOPLEVEL_INCLUDES LIBMATH_INCLUDES LIBSUPCXX_INCLUDES OPTIMIZE_CXXFLAGS WARN_FLAGS LIBSUPCXX_PICFLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libtool_VERSION multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot glibcxx_builddir glibcxx_srcdir toplevel_srcdir CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LN_S AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOL CXXCPP CPPFLAGS enable_shared enable_static LIBUNWIND_FLAG GLIBCXX_BUILD_PCH_TRUE GLIBCXX_BUILD_PCH_FALSE glibcxx_PCHFLAGS CSTDIO_H FPOS_H BASIC_FILE_H BASIC_FILE_CC CPP EGREP check_msgfmt glibcxx_MOFILES glibcxx_POFILES glibcxx_localedir USE_NLS CLOCALE_H CCODECVT_H CMESSAGES_H CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_H CTIME_CC CLOCALE_CC CLOCALE_INTERNAL_H C_INCLUDE_DIR GLIBCXX_C_HEADERS_C_TRUE GLIBCXX_C_HEADERS_C_FALSE GLIBCXX_C_HEADERS_C_STD_TRUE GLIBCXX_C_HEADERS_C_STD_FALSE GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE glibcxx_thread_h DEBUG_FLAGS GLIBCXX_BUILD_DEBUG_TRUE GLIBCXX_BUILD_DEBUG_FALSE EXTRA_CXX_FLAGS SECTION_FLAGS SECTION_LDFLAGS OPT_LDFLAGS LIBMATHOBJS WERROR SYMVER_MAP port_specific_symbol_files GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE baseline_dir GLIBCXX_TEST_WCHAR_T_TRUE GLIBCXX_TEST_WCHAR_T_FALSE GLIBCXX_TEST_ABI_TRUE GLIBCXX_TEST_ABI_FALSE ATOMICITY_INC_SRCDIR FPOS_INC_SRCDIR OS_INC_SRCDIR CANADIAN_TRUE CANADIAN_FALSE GLIBCXX_BUILD_LIBMATH_TRUE GLIBCXX_BUILD_LIBMATH_FALSE glibcxx_prefixdir gxx_include_dir glibcxx_toolexecdir glibcxx_toolexeclibdir GLIBCXX_INCLUDES TOPLEVEL_INCLUDES LIBMATH_INCLUDES LIBSUPCXX_INCLUDES OPTIMIZE_CXXFLAGS WARN_FLAGS LIBSUPCXX_PICFLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -749,26 +749,14 @@ ac_env_target_alias_set=${target_alias+set}
|
||||
ac_env_target_alias_value=$target_alias
|
||||
ac_cv_env_target_alias_set=${target_alias+set}
|
||||
ac_cv_env_target_alias_value=$target_alias
|
||||
ac_env_CC_set=${CC+set}
|
||||
ac_env_CC_value=$CC
|
||||
ac_cv_env_CC_set=${CC+set}
|
||||
ac_cv_env_CC_value=$CC
|
||||
ac_env_CFLAGS_set=${CFLAGS+set}
|
||||
ac_env_CFLAGS_value=$CFLAGS
|
||||
ac_cv_env_CFLAGS_set=${CFLAGS+set}
|
||||
ac_cv_env_CFLAGS_value=$CFLAGS
|
||||
ac_env_LDFLAGS_set=${LDFLAGS+set}
|
||||
ac_env_LDFLAGS_value=$LDFLAGS
|
||||
ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
|
||||
ac_cv_env_LDFLAGS_value=$LDFLAGS
|
||||
ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_env_CXXCPP_set=${CXXCPP+set}
|
||||
ac_env_CXXCPP_value=$CXXCPP
|
||||
ac_cv_env_CXXCPP_set=${CXXCPP+set}
|
||||
ac_cv_env_CXXCPP_value=$CXXCPP
|
||||
ac_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
|
||||
ac_cv_env_CPPFLAGS_value=$CPPFLAGS
|
||||
ac_env_CPP_set=${CPP+set}
|
||||
ac_env_CPP_value=$CPP
|
||||
ac_cv_env_CPP_set=${CPP+set}
|
||||
@ -1972,6 +1960,28 @@ if test "${with_newlib+set}" = set; then
|
||||
|
||||
fi;
|
||||
|
||||
# We're almost certainly being configured before anything else which uses
|
||||
# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that
|
||||
# we not cache the value of CXX that we "discover" here, because it's set
|
||||
# to something unique for us and libjava. Other target libraries need to
|
||||
# find CXX for themselves. We yank the rug out from under the normal AC_*
|
||||
# process by sneakily renaming the cache variable. This also lets us debug
|
||||
# the value of "our" CXX in postmortems.
|
||||
#
|
||||
# We must also force CXX to /not/ be a precious variable, otherwise the
|
||||
# wrong (non-multilib-adjusted) value will be used in multilibs. This
|
||||
# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side
|
||||
# effect, CXXFLAGS is no longer automagically subst'd, so we have to do
|
||||
# that ourselves. Un-preciousing AC_PROG_CC also affects CC and CFLAGS.
|
||||
#
|
||||
# -fno-builtin must be present here so that a non-conflicting form of
|
||||
# std::exit can be guessed by AC_PROG_CXX, and used in later tests.
|
||||
|
||||
|
||||
|
||||
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -fno-builtin"
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@ -2839,29 +2849,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
# We're almost certainly being configured before anything else which uses
|
||||
# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that
|
||||
# we not cache the value of CXX that we "discover" here, because it's set
|
||||
# to something unique for us and libjava. Other target libraries need to
|
||||
# find CXX for themselves. We yank the rug out from under the normal AC_*
|
||||
# process by sneakily renaming the cache variable. This also lets us debug
|
||||
# the value of "our" CXX in postmortems.
|
||||
#
|
||||
# We must also force CXX to /not/ be a precious variable, otherwise the
|
||||
# wrong (non-multilib-adjusted) value will be used in multilibs. This
|
||||
# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side
|
||||
# effect, CXXFLAGS is no longer automagically subst'd, so we have to do
|
||||
# that ourselves.
|
||||
#
|
||||
# -fno-builtin must be present here so that a non-conflicting form of
|
||||
# std::exit can be guessed by AC_PROG_CXX, and used in later tests.
|
||||
|
||||
|
||||
|
||||
|
||||
save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS -fno-builtin"
|
||||
ac_ext=cc
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@ -3185,6 +3172,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
|
||||
# For directory versioning (e.g., headers) and other variables.
|
||||
echo "$as_me:$LINENO: checking for GCC version number" >&5
|
||||
echo $ECHO_N "checking for GCC version number... $ECHO_C" >&6
|
||||
@ -4285,7 +4273,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
||||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4288 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4276 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -4854,7 +4842,7 @@ fi;
|
||||
#
|
||||
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 4857 "configure"
|
||||
#line 4845 "configure"
|
||||
struct S { ~S(); };
|
||||
void bar();
|
||||
void foo()
|
||||
@ -40064,14 +40052,12 @@ s,@glibcxx_builddir@,$glibcxx_builddir,;t t
|
||||
s,@glibcxx_srcdir@,$glibcxx_srcdir,;t t
|
||||
s,@toplevel_srcdir@,$toplevel_srcdir,;t t
|
||||
s,@CC@,$CC,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
s,@LDFLAGS@,$LDFLAGS,;t t
|
||||
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
||||
s,@ac_ct_CC@,$ac_ct_CC,;t t
|
||||
s,@EXEEXT@,$EXEEXT,;t t
|
||||
s,@OBJEXT@,$OBJEXT,;t t
|
||||
s,@CXX@,$CXX,;t t
|
||||
s,@ac_ct_CXX@,$ac_ct_CXX,;t t
|
||||
s,@CFLAGS@,$CFLAGS,;t t
|
||||
s,@CXXFLAGS@,$CXXFLAGS,;t t
|
||||
s,@LN_S@,$LN_S,;t t
|
||||
s,@AS@,$AS,;t t
|
||||
@ -40085,6 +40071,7 @@ s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
|
||||
s,@MAINT@,$MAINT,;t t
|
||||
s,@LIBTOOL@,$LIBTOOL,;t t
|
||||
s,@CXXCPP@,$CXXCPP,;t t
|
||||
s,@CPPFLAGS@,$CPPFLAGS,;t t
|
||||
s,@enable_shared@,$enable_shared,;t t
|
||||
s,@enable_static@,$enable_static,;t t
|
||||
s,@LIBUNWIND_FLAG@,$LIBUNWIND_FLAG,;t t
|
||||
|
||||
Loading…
Reference in New Issue
Block a user