Mercurial > mxe-octave
changeset 3476:f38cc7e463d5
Makefile.in: Set ENABLE_64 before TARGET. Set TARGET appropriately
for cross builds with ENABLE_64.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 31 Jan 2014 11:49:45 -0500 |
| parents | 81544b3fe0ca |
| children | 6a36441bfafd |
| files | Makefile.in |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Fri Jan 31 11:47:59 2014 -0500 +++ b/Makefile.in Fri Jan 31 11:49:45 2014 -0500 @@ -40,12 +40,20 @@ # on your system (default is yes if doing native build). USE_SYSTEM_FONTCONFIG := @USE_SYSTEM_FONTCONFIG@ +# Attempt to build Octave and dependencies with 64-bit indexing +# enabled (experimental; requires 64-bit system and compiler). +ENABLE_64 := @ENABLE_64@ + # Should match what config.guess prints for your system. # If cross compiling, you must set it manually. ifeq ($(MXE_NATIVE_BUILD),yes) TARGET := $(shell tools/config.guess) else - TARGET := i686-pc-mingw32 + ifeq ($(ENABLE_64),yes) + TARGET := x86_64-w64-mingw32 + else + TARGET := i686-pc-mingw32 + endif endif BUILD_SYSTEM := $(shell tools/config.guess) @@ -56,10 +64,6 @@ USE_PIC_FLAG := @USE_PIC_FLAG@ -# Attempt to build Octave and dependencies with 64-bit indexing -# enabled (experimental; requires 64-bit system and compiler). -ENABLE_64 := @ENABLE_64@ - # Attempt to build with support for Java. ENABLE_JAVA := @ENABLE_JAVA@