git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac (ZW_PROG_COMPILER_DEPENDENCIES): Use CXX instead of CC. 

2013-10-24  Jan-Benedict Glaw  <jbglaw@lug-owl.de>

	* configure.ac (ZW_PROG_COMPILER_DEPENDENCIES): Use CXX instead of CC.
	* Makefile.in (CXXDEPMODE): Assign and change users.
	(CCDEPMODE): Delete.
	* configure: Regenerate.

From-SVN: r204006
This commit is contained in:
Jan-Benedict Glaw 2013-10-24 10:15:52 +00:00 committed by Jan-Benedict Glaw
parent 2f9bcd4452
commit 54c09437d1
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2013-10-24 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* configure.ac (ZW_PROG_COMPILER_DEPENDENCIES): Use CXX instead of CC.
* Makefile.in (CXXDEPMODE): Assign and change users.
(CCDEPMODE): Delete.
* configure: Regenerate.
2013-10-23 David Malcolm <dmalcolm@redhat.com> 2013-10-23 David Malcolm <dmalcolm@redhat.com>
* gengtype-parse.c (require_without_advance): New. * gengtype-parse.c (require_without_advance): New.

6
gcc/Makefile.in
View File

@ -311,7 +311,7 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
# -------- # --------
# Dependency tracking stuff. # Dependency tracking stuff.
CCDEPMODE = @CCDEPMODE@ CXXDEPMODE = @CXXDEPMODE@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
depcomp = $(SHELL) $(srcdir)/../depcomp depcomp = $(SHELL) $(srcdir)/../depcomp
@ -1040,7 +1040,7 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
$(CLOOGINC) $(ISLINC) $(CLOOGINC) $(ISLINC)
COMPILE.base = $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) -o $@ COMPILE.base = $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) -o $@
ifeq ($(CCDEPMODE),depmode=gcc3) ifeq ($(CXXDEPMODE),depmode=gcc3)
# Note a subtlety here: we use $(@D) for the directory part, to make # Note a subtlety here: we use $(@D) for the directory part, to make
# things like the go/%.o rule work properly; but we use $(*F) for the # things like the go/%.o rule work properly; but we use $(*F) for the
# file part, as we just want the file part of the stem, not the entire # file part, as we just want the file part of the stem, not the entire
@ -1049,7 +1049,7 @@ COMPILE = $(COMPILE.base) -MT $@ -MMD -MP -MF $(@D)/$(DEPDIR)/$(*F).TPo
POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(*F).TPo $(@D)/$(DEPDIR)/$(*F).Po
else else
COMPILE = source='$<' object='$@' libtool=no \ COMPILE = source='$<' object='$@' libtool=no \
DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) $(COMPILE.base) DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) $(COMPILE.base)
POSTCOMPILE = POSTCOMPILE =
endif endif

20
gcc/configure vendored
View File

@ -737,7 +737,7 @@ LDEXP_LIB
EXTRA_GCC_LIBS EXTRA_GCC_LIBS
GNAT_LIBEXC GNAT_LIBEXC
COLLECT2_LIBS COLLECT2_LIBS
CCDEPMODE CXXDEPMODE
DEPDIR DEPDIR
am__leading_dot am__leading_dot
CXXCPP CXXCPP
@ -8766,12 +8766,12 @@ ac_config_commands="$ac_config_commands depdir"
ac_config_commands="$ac_config_commands gccdepdir" ac_config_commands="$ac_config_commands gccdepdir"
depcc="$CC" am_compiler_list= depcc="$CXX" am_compiler_list=
am_depcomp=$ac_aux_dir/depcomp am_depcomp=$ac_aux_dir/depcomp
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; } $as_echo_n "checking dependency style of $depcc... " >&6; }
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
if test -f "$am_depcomp"; then if test -f "$am_depcomp"; then
@ -8793,7 +8793,7 @@ else
# directory. # directory.
mkdir sub mkdir sub
am_cv_CC_dependencies_compiler_type=none am_cv_CXX_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` am_compiler_list=`sed -n 's/^\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi fi
@ -8838,7 +8838,7 @@ else
# icc: Command line remark: option '-MP' not supported # icc: Command line remark: option '-MP' not supported
if (grep 'ignoring option' conftest.err || if (grep 'ignoring option' conftest.err ||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_CC_dependencies_compiler_type=$depmode am_cv_CXX_dependencies_compiler_type=$depmode
$as_echo "$as_me:$LINENO: success" >&5 $as_echo "$as_me:$LINENO: success" >&5
break break
fi fi
@ -8850,15 +8850,15 @@ else
cd .. cd ..
rm -rf conftest.dir rm -rf conftest.dir
else else
am_cv_CC_dependencies_compiler_type=none am_cv_CXX_dependencies_compiler_type=none
fi fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
if test x${am_cv_CC_dependencies_compiler_type-none} = xnone if test x${am_cv_CXX_dependencies_compiler_type-none} = xnone
then as_fn_error "no usable dependency style found" "$LINENO" 5 then as_fn_error "no usable dependency style found" "$LINENO" 5
else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type else CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
fi fi

2
gcc/configure.ac
View File

@ -974,7 +974,7 @@ AC_CONFIG_COMMANDS([gccdepdir],[
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs $lang/$DEPDIR ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs $lang/$DEPDIR
done], [subdirs="$subdirs" ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR]) done], [subdirs="$subdirs" ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR])
ZW_PROG_COMPILER_DEPENDENCIES([CC]) ZW_PROG_COMPILER_DEPENDENCIES([CXX])
AC_LANG_POP(C++) AC_LANG_POP(C++)
# -------- # --------