Mercurial > octave-nkf

diff configure.ac @ 15945:a653526ea4a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 398ae067e811
children 25eff7fe556d cc5a7d1233f3
line wrap: on
line diff
--- a/configure.ac	Sat Jan 12 00:58:19 2013 -0600
+++ b/configure.ac	Mon Jan 14 15:07:04 2013 -0500
@@ -1794,30 +1794,38 @@
 
 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
   CROSS_TOOL_PREFIX="$ac_tool_prefix"
+  MKOCTFILE_AR='$(shell echo $(AR) | sed "s,$(CROSS_TOOL_PREFIX),,")'
   MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
   MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
   MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
   MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
   MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
+  MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | sed "s,$(CROSS_TOOL_PREFIX),,")'
 else
+  MKOCTFILE_AR="$AR"
   MKOCTFILE_CC="$CC"
   MKOCTFILE_CXX="$CXX"
   MKOCTFILE_DL_LD="$DL_LD"
   MKOCTFILE_F77="$F77"
   MKOCTFILE_LD_CXX="$LD_CXX"
+  MKOCTFILE_RANLIB="$RANLIB"
 fi
 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
+AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR])
 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
+AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB])
 AC_SUBST(CROSS_TOOL_PREFIX)
+AC_SUBST(MKOCTFILE_AR)
 AC_SUBST(MKOCTFILE_CC)
 AC_SUBST(MKOCTFILE_CXX)
 AC_SUBST(MKOCTFILE_DL_LD)
 AC_SUBST(MKOCTFILE_F77)
 AC_SUBST(MKOCTFILE_LD_CXX)
+AC_SUBST(MKOCTFILE_RANLIB)
 
 ### Check for existence of various libraries