Mercurial > mxe-octave
comparison Makefile.in @ 3256:7fb479d0241c
Update build tools for native mingw
* src/build-m4.mk: do nothing for native mingw build
* Makefile.in:
- add bison, m4 as natve mingw, and python as jit build requirements.
- remove build-bison as a mingw build dependancy
* index.html: Add msys-bison to mingw required packages and mention ghostscript and python.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Thu, 26 Sep 2013 21:18:39 -0400 |
parents | bd4487905031 |
children | 869f160d71b6 |
comparison
equal
deleted
inserted
replaced
3253:11b9d461c135 | 3256:7fb479d0241c |
---|---|
130 | 130 |
131 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) | 131 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) |
132 REQUIREMENTS += bsdtar | 132 REQUIREMENTS += bsdtar |
133 endif | 133 endif |
134 | 134 |
135 # if we want jit (llvm) we need python | |
136 ifeq ($(ENABLE_JIT),yes) | |
137 REQUIREMENTS += python | |
138 endif | |
139 | |
135 LIBTOOL := libtool | 140 LIBTOOL := libtool |
136 LIBTOOLIZE := libtoolize | 141 LIBTOOLIZE := libtoolize |
137 | 142 |
138 ## Build tools are tools that we need to build everything else. | 143 ## Build tools are tools that we need to build everything else. |
139 ## They run on the build system. Some, like gcc and binutils may | 144 ## They run on the build system. Some, like gcc and binutils may |
144 # Building flex for native mingw fails, so disable it. | 149 # Building flex for native mingw fails, so disable it. |
145 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) | 150 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) |
146 REQUIREMENTS += flex | 151 REQUIREMENTS += flex |
147 BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS)) | 152 BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS)) |
148 endif | 153 endif |
154 # Building bison for native mingw creates a bison that doesnt | |
155 # allow push-pull mode so disable | |
156 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) | |
157 REQUIREMENTS += bison | |
158 BUILD_TOOLS := $(filter-out build-bison, $(BUILD_TOOLS)) | |
159 endif | |
160 # use the msys m4 in native mingw | |
161 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) | |
162 REQUIREMENTS += m4 | |
163 endif | |
164 | |
165 | |
149 ifeq ($(USE_SYSTEM_GCC),yes) | 166 ifeq ($(USE_SYSTEM_GCC),yes) |
150 BUILD_TOOLS := $(filter-out $(BUILD_COMPILER_TOOLS), $(BUILD_TOOLS)) | 167 BUILD_TOOLS := $(filter-out $(BUILD_COMPILER_TOOLS), $(BUILD_TOOLS)) |
151 endif | 168 endif |
152 ifneq ($(MXE_SYSTEM),msvc) | 169 ifneq ($(MXE_SYSTEM),msvc) |
153 BUILD_TOOLS := $(filter-out build-msvctools, $(BUILD_TOOLS)) | 170 BUILD_TOOLS := $(filter-out build-msvctools, $(BUILD_TOOLS)) |