Mercurial > octave-nkf

comparison src/mkoctfile.cc.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
comparison
equal deleted inserted replaced
13023:7d1e11d922aa 13024:f3c53fea9fb5
749 { 749 {
750 string cmd = vars["LD_CXX"] + " " + vars["CPPFLAGS"] + " " 750 string cmd = vars["LD_CXX"] + " " + vars["CPPFLAGS"] + " "
751 + vars["ALL_CXXFLAGS"] + " " + vars["RDYNAMIC_FLAG"] 751 + vars["ALL_CXXFLAGS"] + " " + vars["RDYNAMIC_FLAG"]
752 + " " + vars["ALL_LDFLAGS"] + " " + pass_on_options 752 + " " + vars["ALL_LDFLAGS"] + " " + pass_on_options
753 + " " + output_option + " " + objfiles + " " + libfiles 753 + " " + output_option + " " + objfiles + " " + libfiles
754 + " " + ldflags + " " + vars["LFLAGS"] + " " 754 + " " + ldflags + " " + vars["LFLAGS"]
755 + " -loctinterp -loctave -lcruft "
755 + " " + vars["OCT_LINK_OPTS"] 756 + " " + vars["OCT_LINK_OPTS"]
756 + " " + vars["OCTAVE_LINK_DEPS"]; 757 + " " + vars["OCTAVE_LINK_DEPS"];
757 result = run_command (cmd); 758 result = run_command (cmd);
758 } 759 }
759 else 760 else
765 } 766 }
766 else 767 else
767 { 768 {
768 string cmd = vars["DL_LD"] + " " + vars["DL_LDFLAGS"] + " " 769 string cmd = vars["DL_LD"] + " " + vars["DL_LDFLAGS"] + " "
769 + pass_on_options + " -o " + octfile + " " + objfiles + " " 770 + pass_on_options + " -o " + octfile + " " + objfiles + " "
770 + libfiles + " " + ldflags + " " + vars["LFLAGS"] + " " 771 + libfiles + " " + ldflags + " " + vars["LFLAGS"]
772 + " -loctinterp -loctave -lcruft "
771 + vars["OCT_LINK_OPTS"] + " " + vars["OCT_LINK_DEPS"]; 773 + vars["OCT_LINK_OPTS"] + " " + vars["OCT_LINK_DEPS"];
772 result = run_command (cmd); 774 result = run_command (cmd);
773 } 775 }
774 776
775 if (strip) 777 if (strip)