Mercurial > hg > octave-jordi
changeset 19365:f550bf908f47 gui-release
Remove unused FC variable from build system.
* configure.ac: Remove alias of FC to F77 variable and AC_SUBST(FC).
* build-aux/common.mk: Remove FC autoconf substitution. Remove substitution of
OCTAVE_CONF_FC with FC.
* toplev.cc: Remove OCTAVE_CONF_FC from conf_info[] structure.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 28 Nov 2014 08:21:57 -0800 |
| parents | 8d267cca249e |
| children | 7467c3e773fd |
| files | build-aux/common.mk configure.ac libinterp/corefcn/toplev.cc |
| diffstat | 3 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -91,7 +91,6 @@ # Fortran compiler flags. -FC = @FC@ F77 = @F77@ AM_FFLAGS = @FFLAGS@ FPICFLAG = @FPICFLAG@ @@ -557,7 +556,6 @@ -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \ -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \ -e "s|%OCTAVE_CONF_F77_INTEGER_8_FLAG%|\"${F77_INTEGER_8_FLAG}\"|" \ - -e "s|%OCTAVE_CONF_FC%|\"${FC}\"|" \ -e "s|%OCTAVE_CONF_FFLAGS%|\"${FFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_CPPFLAGS%|\"${FFTW3_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_FFTW3_LDFLAGS%|\"${FFTW3_LDFLAGS}\"|" \
--- a/configure.ac +++ b/configure.ac @@ -719,10 +719,6 @@ fi AC_SUBST(F77_INTEGER_8_FLAG) -## FIXME: Is this really used? Makefile seems to use $F77 for compiler -FC=$F77 -AC_SUBST(FC) - OCTAVE_F77_FLAG([-ffloat-store], [ AC_MSG_RESULT([setting F77_FLOAT_STORE_FLAG to -ffloat-store]) F77_FLOAT_STORE_FLAG=-ffloat-store
--- a/libinterp/corefcn/toplev.cc +++ b/libinterp/corefcn/toplev.cc @@ -1312,7 +1312,6 @@ { false, "F77", OCTAVE_CONF_F77 }, { false, "F77_FLOAT_STORE_FLAG", OCTAVE_CONF_F77_FLOAT_STORE_FLAG }, { false, "F77_INTEGER_8_FLAG", OCTAVE_CONF_F77_INTEGER_8_FLAG }, - { false, "FC", OCTAVE_CONF_FC }, { false, "FFLAGS", OCTAVE_CONF_FFLAGS }, { false, "FFTW3_CPPFLAGS", OCTAVE_CONF_FFTW3_CPPFLAGS }, { false, "FFTW3_LDFLAGS", OCTAVE_CONF_FFTW3_LDFLAGS },