Mercurial > hg > octave-nkf
changeset 4298:055d2f68d445
[project @ 2003-01-13 15:09:31 by jwe]
| author | jwe |
|---|---|
| date | Mon, 13 Jan 2003 15:10:39 +0000 |
| parents | 59a2ba0fb205 |
| children | 02fcb550f20c |
| files | ChangeLog Makeconf.in configure.in doc/ChangeLog doc/interpreter/Makefile.in scripts/ChangeLog scripts/Makefile.in src/ChangeLog |
| diffstat | 8 files changed, 44 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-01-11 John W. Eaton <jwe@bevo.che.wisc.edu> + + * configure.in: Don't bother with compiler flags for + explicit/no-implicit template instantiation. + +2003-01-11 Paul Kienzle <pkienzle@users.sf.net> + + * configure.in, Makeconf.in: Allow setting of BUILD_LDFLAGS. + 2003-01-11 John W. Eaton <jwe@bevo.che.wisc.edu> * autogen.sh: Use --force for autoconf and autoheader.
--- a/Makeconf.in +++ b/Makeconf.in @@ -143,6 +143,8 @@ LD_STATIC_FLAG = @LD_STATIC_FLAG@ ALL_LDFLAGS = $(LIBFLAGS) $(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS) +BUILD_LDFLAGS = @BUILD_LDFLAGS@ + SH_LD = @SH_LD@ SH_LDFLAGS = @SH_LDFLAGS@
--- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ ### 02111-1307, USA. AC_INIT -AC_REVISION($Revision: 1.407 $) +AC_REVISION($Revision: 1.408 $) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -173,12 +173,6 @@ gxx_version=`$CXX -v 2>&1 | grep "^.*g.. version" | \ sed -e 's/^.*g.. version *//' -e 's/cygnus-//' -e 's/egcs-//'` -### Auto instantiate all templates, other than those that are explicitly -### instantiated in Octave. Octave currently instantiates all needed -### templates for GCC-2.8.x and EGCS-1.1.x, but not for newer GNU releases -### nor for other supported compilers. - -cxx_auto_instantiate_templates=yes case "$gxx_version" in 1.* | 2.[[0123456789]].*) AC_MSG_ERROR([g++ version $gxx_version will probably fail to compile Octave]) @@ -298,21 +292,6 @@ ;; esac -### We do our own template instantiation for specific compilers. - -if test "$cxx_auto_instantiate_templates" = no; then - case "$canonical_host_type" in - *-*-darwin*) - OCTAVE_CXX_FLAG(-fno-coalesce-templates, [ - XTRA_CXXFLAGS="$XTRA_CXXFLAGS -fno-coalesce-templates" - AC_MSG_RESULT([adding -fno-coalesce-templates to XTRA_CXXFLAGS])]) - ;; - esac - OCTAVE_CXX_FLAG(-fno-implicit-templates, [ - XTRA_CXXFLAGS="$XTRA_CXXFLAGS -fno-implicit-templates" - AC_MSG_RESULT([adding -fno-implicit-templates to XTRA_CXXFLAGS])]) -fi - AC_SUBST(XTRA_CFLAGS) AC_SUBST(XTRA_CXXFLAGS) @@ -333,37 +312,39 @@ ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are ### the compilers that we use for building tools on the build system. ### For now, we assume that the only cross compiling we can do is -### with gcc on a Unixy system. +### with gcc on a Unixy system, but the dedicated hacker can override these. if test "$cross_compiling" = yes; then BUILD_CC="gcc" BUILD_CFLAGS="-O2 -g" BUILD_CXX="g++" BUILD_CXXFLAGS="-O2 -g" + BUILD_LDFLAGS="" BUILD_EXEEXT="" else - BUILD_CC="$CC" - BUILD_CFLAGS="-O2 -g" - BUILD_CXX="$CXX" - BUILD_CXXFLAGS="-O2 -g" + BUILD_CC='$(CC)' + BUILD_CFLAGS='$(CFLAGS)' + BUILD_CXX='$(CXX)' + BUILD_CXXFLAGS='$(CXXFLAGS)' + BUILD_LDFLAGS='$(LDFLAGS)' case "$canonical_host_type" in sparc-sun-solaris2*) if test "$GCC" != yes; then - BUILD_CC="$CC -O1" - BUILD_CFLAGS="-g" - BUILD_CXX="$CXX -O1" - BUILD_CXXFLAGS="-g" + ## The Sun C++ compiler never seems to complete compiling + ## gendoc.cc unless we reduce the optimization level... + BUILD_CXXFLAGS="-g -O1" fi ;; esac - BUILD_EXEEXT="$EXEEXT" + BUILD_EXEEXT='$(EXEEXT)' fi AC_ARG_VAR(BUILD_CC, [build system C compiler (used if cross compiling)]) AC_ARG_VAR(BUILD_CFLAGS, [build system C compiler flags (used if cross compiling)]) AC_ARG_VAR(BUILD_CXX, [build system C++ compiler (used if cross compiling)]) AC_ARG_VAR(BUILD_CXXFLAGS, [build system C++ compiler flags (used if cross compiling)]) -AC_SUBST(BUILD_EXEEXT) +AC_ARG_VAR(BUILD_LDFLAGS, [build system C++ compiler link flags (used if cross compiling)]) +AC_ARG_VAR(BUILD_EXEEXT, [build system executable extension (used if cross compiling)]) dnl This is bogus. We shouldn't have to explicitly add libc too!
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2003-01-11 Paul Kienzle <pkienzle@users.sf.net> + + * interpreter/Makefile.in (munge-texi$(BUILD_EXEEXT)): Pass + $(BUILD_CXXFLAGS) and $(BUILD_LDFLAGS) to compiler. + (%.o : %.cc): Delete pattern rule. + 2003-01-03 John W. Eaton <jwe@bevo.che.wisc.edu> * interpreter/munge-texi.cc: Define __USE_STD_IOSTREAM if using
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -68,11 +68,8 @@ $(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT) -%.o : %.cc - $(BUILD_CXX) -c $(INCFLAGS) -DHAVE_CONFIG_H $< -o $@ - -munge-texi$(BUILD_EXEEXT): munge-texi.o - $(BUILD_CXX) -o $@ $^ +munge-texi$(BUILD_EXEEXT): munge-texi.cc + $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS) src-DOCSTRINGS: $(MAKE) -C ../../src DOCSTRINGS
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2003-01-11 Paul Kienzle <pkienzle@users.sf.net> + + * Makefile.in (gethelp$(BUILD_EXEEXT)): Pass $(BUILD_CXXFLAGS) and + $(BUILD_LDFLAGS) to compiler. + 2003-01-10 John W. Eaton <jwe@bevo.che.wisc.edu> * general/num2str.m: Don't specify field width for scalars.
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -53,7 +53,7 @@ mv $@.t $@ gethelp$(BUILD_EXEEXT): gethelp.cc - $(BUILD_CXX) -o $@ $^ + $(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS) install install-strip uninstall clean mostlyclean distclean maintainer-clean:: @$(subdir-for-command)