Mercurial > octave-nkf
view libinterp/link-deps.mk @ 20649:d35201e5ce5d
Fix compilation of jit broken by dd6345fd8a97 (bug #46191).
* jit-typeinfo.cc (octave_jit_compute_nelem): Use rng.numel() rather than
deprecated nelem().
* jit-typeinfo.cc (octave_jit_ginvalid_index): Call gripe_invalid_index (-1)
now that 0-argument form of function has been removed.
* jit-typeinfo.h (jit_range): Use numel() rather than nelem() for Range.
* pt-jit.cc (trip_count): Use numel() rather than nelem() for Range.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 12 Oct 2015 16:08:12 -0700 |
parents | 0ce7d8303152 |
children | b65888ec820e |
line wrap: on
line source
if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTINTERP_LINK_DEPS = else LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS) endif LIBOCTINTERP_LINK_DEPS += \ $(FT2_LIBS) \ $(HDF5_LIBS) \ $(Z_LIBS) \ $(FFTW_XLIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) \ $(GL2PS_LIBS) \ $(LLVM_LIBS) \ $(JAVA_LIBS) \ $(LAPACK_LIBS) LIBOCTINTERP_LINK_OPTS = \ $(FT2_LDFLAGS) \ $(HDF5_LDFLAGS) \ $(Z_LDFLAGS) \ $(FFTW_XLDFLAGS) \ $(LLVM_LDFLAGS) OCT_LINK_DEPS = OCT_LINK_OPTS = $(LDFLAGS) if AMCOND_LINK_ALL_DEPS LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS) LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS) OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS) OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS) OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) endif