Mercurial > octave

comparison src/mkoctfile.in.cc @ 15944:4803b8c138e3

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/private/configure_make.m: Use mkoctfile, not octave_config_info to get values for CC, CXX, AR, and RANLIB. * mkoctfile.in.cc, mkoctfile.in.sh (AR, RANLIB): New variables. Update usage message.
author John W. Eaton <jwe@octave.org>
date Mon, 14 Jan 2013 14:59:01 -0500
parents 58018d0e9a71
children 25eff7fe556d
comparison
equal deleted inserted replaced
15942:75cea615ade4 15944:4803b8c138e3
211 vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%); 211 vars["CXX"] = get_variable ("CXX", %OCTAVE_CONF_MKOCTFILE_CXX%);
212 vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%); 212 vars["CXXFLAGS"] = get_variable ("CXXFLAGS", %OCTAVE_CONF_CXXFLAGS%);
213 vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%); 213 vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%);
214 vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%); 214 vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%);
215 vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS", %OCTAVE_CONF_XTRA_CXXFLAGS%); 215 vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS", %OCTAVE_CONF_XTRA_CXXFLAGS%);
216
217 vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%);
218 vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%);
216 219
217 vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%); 220 vars["DEPEND_FLAGS"] = get_variable ("DEPEND_FLAGS", %OCTAVE_CONF_DEPEND_FLAGS%);
218 vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%); 221 vars["DEPEND_EXTRA_SED_PATTERN"] = get_variable ("DEPEND_EXTRA_SED_PATTERN", %OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%);
219 222
220 vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%); 223 vars["DL_LD"] = get_variable ("DL_LD", %OCTAVE_CONF_MKOCTFILE_DL_LD%);
297 " -g Enable debugging options for compilers.\n" 300 " -g Enable debugging options for compilers.\n"
298 "\n" 301 "\n"
299 " -p VAR, --print VAR Print configuration variable VAR. Recognized\n" 302 " -p VAR, --print VAR Print configuration variable VAR. Recognized\n"
300 " variables are:\n" 303 " variables are:\n"
301 "\n" 304 "\n"
302 " ALL_CFLAGS FLIBS\n" 305 " ALL_CFLAGS FFTW3F_LDFLAGS\n"
303 " ALL_CXXFLAGS FPICFLAG\n" 306 " ALL_CXXFLAGS FFTW3F_LIBS\n"
304 " ALL_FFLAGS INCFLAGS\n" 307 " ALL_FFLAGS FLIBS\n"
305 " ALL_LDFLAGS LAPACK_LIBS\n" 308 " ALL_LDFLAGS FPICFLAG\n"
306 " BLAS_LIBS LDFLAGS\n" 309 " AR INCFLAGS\n"
307 " CC LD_CXX\n" 310 " BLAS_LIBS LAPACK_LIBS\n"
308 " CFLAGS LD_STATIC_FLAG\n" 311 " CC LDFLAGS\n"
309 " CPICFLAG LFLAGS\n" 312 " CFLAGS LD_CXX\n"
310 " CPPFLAGS LIBOCTAVE\n" 313 " CPICFLAG LD_STATIC_FLAG\n"
311 " CXX LIBOCTINTERP\n" 314 " CPPFLAGS LFLAGS\n"
312 " CXXFLAGS LIBS\n" 315 " CXX LIBOCTAVE\n"
313 " CXXPICFLAG OCTAVE_LIBS\n" 316 " CXXFLAGS LIBOCTINTERP\n"
314 " DEPEND_EXTRA_SED_PATTERN OCTAVE_LINK_DEPS\n" 317 " CXXPICFLAG LIBS\n"
315 " DEPEND_FLAGS OCTAVE_LINK_OPTS\n" 318 " DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n"
316 " DL_LD OCT_LINK_DEPS\n" 319 " DEPEND_FLAGS OCTAVE_LINK_DEPS\n"
317 " DL_LDFLAGS OCT_LINK_OPTS\n" 320 " DL_LD OCT_LINK_DEPS\n"
318 " EXEEXT RDYNAMIC_FLAG\n" 321 " DL_LDFLAGS RANLIB\n"
319 " F77 READLINE_LIBS\n" 322 " EXEEXT RDYNAMIC_FLAG\n"
320 " F77_INTEGER_8_FLAG SED\n" 323 " F77 READLINE_LIBS\n"
321 " FFLAGS XTRA_CFLAGS\n" 324 " F77_INTEGER_8_FLAG SED\n"
322 " FFTW3_LDFLAGS XTRA_CXXFLAGS\n" 325 " FFLAGS XTRA_CFLAGS\n"
323 " FFTW3_LIBS\n" 326 " FFTW3_LDFLAGS XTRA_CXXFLAGS\n"
324 " FFTW3F_LDFLAGS\n" 327 " FFTW3_LIBS\n"
325 " FFTW3F_LIBS\n"
326 "\n" 328 "\n"
327 " --link-stand-alone Link a stand-alone executable file.\n" 329 " --link-stand-alone Link a stand-alone executable file.\n"
328 "\n" 330 "\n"
329 " --mex Assume we are creating a MEX file. Set the\n" 331 " --mex Assume we are creating a MEX file. Set the\n"
330 " default output extension to \".mex\".\n" 332 " default output extension to \".mex\".\n"