Mercurial > hg > octave-lyh
diff build-aux/common.mk @ 15167:1c711a646fa7
Deprecate configure variables CC_VERSION, CXX_VERSION.
Replaced with GCC_VERSION, GXX_VERSION.
* NEWS: Announce deprecated variables CC_VERSION, CXX_VERSION.
* common.mk: Add new substitutions for GCC_VERSION, GXX_VERSION
* configure.ac: Add new substitutions for GCC_VERSION, GXX_VERSION
* toplev.cc (Foctave_config_info): Add variables OCTAVE_CONF_GCC_VERSION,
OCTAVE_CONF_GXX_VERSION to configure info report.
* oct-conf.in.h: Add variables OCTAVE_CONF_GCC_VERSION,
OCTAVE_CONF_GXX_VERSION to header file.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 13 Aug 2012 14:04:26 -0700 (2012-08-13) |
| parents | d8a10cae1dcd |
| children | 648dabbb4c6b |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -111,7 +111,9 @@ UGLY_DEFS = @UGLY_DEFS@ CC = @CC@ +## FIXME: CC_VERSION is deprecated and should be removed in version 3.12 CC_VERSION = @CC_VERSION@ +GCC_VERSION = @GCC_VERSION@ CONFIGURE_CFLAGS = @CFLAGS@ CPICFLAG = @CPICFLAG@ XTRA_CFLAGS = @XTRA_CFLAGS@ @@ -133,7 +135,9 @@ GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@ CXX = @CXX@ +## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12 CXX_VERSION = @CXX_VERSION@ +GXX_VERSION = @GXX_VERSION@ CXXCPP = @CXXCPP@ CONFIGURE_CXXFLAGS = @CXXFLAGS@ CXXPICFLAG = @CXXPICFLAG@ @@ -506,6 +510,8 @@ -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \ -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \ + -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \ -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \ -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \ -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \