Mercurial > octave-nkf
diff build-aux/common.mk @ 15932:747dd82082c8 stable
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile
* configure.ac, build-aux/common.mk (CROSS_TOOL_PREFIX, MKOCTFILE_CC,
MKOCTFILE_CXX, MKOCTFILE_DL_LD, MKOCTFILE_DL_LDFLAGS, MKOCTFILE_F77,
MKOCTFILE_LD_CXX): New variables.
(do_subst_config_vals): Include MKOCTFILE_CC, MKOCTFILE_CXX,
MKOCTFILE_DL_LD, MKOCTFILE_F77, and MKOCTFILE_LD_CXX in the list of
substitutions.
* mkoctfile.cc.in, mkoctfile.in (CC, CXX, DL_LD, F77, LD_CXX):
Define from corresponding MKOCTFILE_ variables.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 11 Jan 2013 22:19:46 -0500 |
| parents | 834df9f10963 |
| children | 58018d0e9a71 a653526ea4a5 |
line wrap: on
line diff
--- a/build-aux/common.mk Fri Jan 11 22:12:39 2013 -0500 +++ b/build-aux/common.mk Fri Jan 11 22:19:46 2013 -0500 @@ -1,3 +1,5 @@ +CROSS_TOOL_PREFIX = @CROSS_TOOL_PREFIX@ + AWK = @AWK@ export AWK @@ -164,6 +166,15 @@ FLIBS = @FLIBS@ +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@ + +# List of libraries and their special compilation flags + LIBOCTINTERP = @LIBOCTINTERP@ LIBOCTAVE = @LIBOCTAVE@ LIBCRUFT = @LIBCRUFT@ @@ -539,7 +550,12 @@ -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_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \ + -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_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \