Mercurial > mxe-octave

comparison Makefile.in @ 4693:9288b72977a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.in: Don't require --enable-64 adn --enable-fortran-int64 to match.
author John W. Eaton <jwe@octave.org>
date Tue, 08 May 2018 09:34:35 -0400
parents 0a5da48ccaaf
children 62d71f1bb5f5
comparison
equal deleted inserted replaced
4692:3f120419c40d 4693:9288b72977a1
57 # Build Fortran (and other) numerical library dependencies with 57 # Build Fortran (and other) numerical library dependencies with
58 # 64-bit indexing enabled (experimental; requires 64-bit system and 58 # 64-bit indexing enabled (experimental; requires 64-bit system and
59 # compiler). The usual configuration is to build with ENABLE_64 but 59 # compiler). The usual configuration is to build with ENABLE_64 but
60 # not ENABLE_FORTRAN_INT64. 60 # not ENABLE_FORTRAN_INT64.
61 ENABLE_FORTRAN_INT64 := @ENABLE_FORTRAN_INT64@ 61 ENABLE_FORTRAN_INT64 := @ENABLE_FORTRAN_INT64@
62
63 ## FIXME: this will need to change when Octave 4.4 is released as stable.
64 stable_64_mismatch = false
65 ifeq ($(OCTAVE_TARGET),stable-octave)
66 ifeq ($(ENABLE_64),yes)
67 ifeq ($(ENABLE_FORTRAN_INT64),no)
68 $(error --enable-64 and --enable-fortran-int64 must match for stable-octave)
69 endif
70 else
71 ifeq ($(ENABLE_FORTRAN_INT64),yes)
72 $(error --enable-64 and --enable-fortran-int64 must match for stable-octave)
73 endif
74 endif
75 endif
76
77 62
78 # create binary octave forge tools. 63 # create binary octave forge tools.
79 # if cross, compiling, this also means we will attempt to create cross mkoctfile 64 # if cross, compiling, this also means we will attempt to create cross mkoctfile
80 ENABLE_BINARY_PACKAGES := @ENABLE_BINARY_PACKAGES@ 65 ENABLE_BINARY_PACKAGES := @ENABLE_BINARY_PACKAGES@
81 66