Mercurial > octave-nkf
diff build-aux/common.mk @ 15945:a653526ea4a5 stable
use mkoctfile, not octave_config_info to get default pkg compiler tools
* common.mk (MKOCTFILE_AR, MKOCTFILE_RANLIB): New variables.
(do_subst_config_vals): Include MKOCTFILE_AR and MKOCTFILE_RANLIB in
the list of substitutions.
* configure.ac (MKOCTFILE_AR, MKOCTFILE_RANLIB): Additional mkoctfile
values that receive special treatment when cross compiling.
* pkg/pkg.m (configure_make): Use mkoctfile, not octave_config_info
to get values for CC, CXX, AR, and RANLIB.
* mkoctfile.cc.in, mkoctfile.in (AR, RANLIB): New variables.
Update usage message.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 14 Jan 2013 15:07:04 -0500 |
| parents | 747dd82082c8 |
| children | 25eff7fe556d |
line wrap: on
line diff
--- a/build-aux/common.mk Sat Jan 12 00:58:19 2013 -0600 +++ b/build-aux/common.mk Mon Jan 14 15:07:04 2013 -0500 @@ -166,12 +166,14 @@ FLIBS = @FLIBS@ +MKOCTFILE_AR = @MKOCTFILE_AR@ MKOCTFILE_CC = @MKOCTFILE_CC@ MKOCTFILE_CXX = @MKOCTFILE_CXX@ MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@ MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@ MKOCTFILE_F77 = @MKOCTFILE_F77@ MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@ +MKOCTFILE_RANLIB = @MKOCTFILE_RANLIB@ # List of libraries and their special compilation flags @@ -550,12 +552,14 @@ -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \ + -e 's|%OCTAVE_CONF_MKOCTFILE_AR%|\"${MKOCTFILE_AR}\"|' \ -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \ -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \ -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \ -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \ -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \ -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \ + -e 's|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|' \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \