Mercurial > hg > octave-nkf

diff src/mkoctfile.in @ 13024:f3c53fea9fb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: more linking tweaks * configure.ac (--enable-link-all-dependencies): New option. (--enable-no-undefined): New option. Don't set NO_UNDEFINED_LDFLAG specially on Windows systems. * liboctave/link-deps.mk (LIBOCTAVE_LINK_DEPS): Include $(LAPACK_LIBS), $(BLAS_LIBS) and $(LIBS) in the list. * config-modules.awk: Add $(NO_UNDEFINED_LDFLAG) to LDFLAGS variables. * src/link-deps.mk (OCT_LINK_DEPS): Remove $(NO_UNDEFINED_LDFLAG from the list. * src/mkoctfile.cc.in, mkoctfile.in: Always link files with -loctinterp, -loctave, and -lcruft.
author John W. Eaton <jwe@octave.org>
date Mon, 29 Aug 2011 11:49:30 -0400
parents edc5ec6e949b
children 4a86826dbb0e
line wrap: on
line diff
--- a/src/mkoctfile.in
+++ b/src/mkoctfile.in
@@ -101,8 +101,8 @@
 : ${FLIBS=%OCTAVE_CONF_FLIBS%}
 : ${OCTAVE_LINK_DEPS=%OCTAVE_CONF_OCTAVE_LINK_DEPS%}
 : ${OCTAVE_LINK_DEPS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%}
-: ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%}
-: ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_OPTS%}
+: ${OCT_LINK_DEPS=%OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%}
+: ${OCT_LINK_DEPS=%OCTAVE_CONF_MKOCTFILE_OCT_LINK_OPTS%}
 : ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
 : ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
 : ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
@@ -534,7 +534,7 @@
 if $link && [ -n "$objfiles" ]; then
   if $link_stand_alone; then
     if [ -n "$LD_CXX" ]; then
-      cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS $RLD_FLAG $OCTAVE_LINK_OPTS $OCTAVE_LINK_DEPS"
+      cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave -lcruft $RLD_FLAG $OCTAVE_LINK_OPTS $OCTAVE_LINK_DEPS"
       $dbg $cmd
       eval $cmd
     else
@@ -542,7 +542,7 @@
       exit 1
     fi
   else
-    cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LFLAGS $OCT_LINK_OPTS $OCT_LINK_DEPS"
+    cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave -lcruft $OCT_LINK_OPTS $OCT_LINK_DEPS"
     $dbg $cmd
     eval $cmd
   fi