Mercurial > mxe-octave

diff Makefile.in @ 3256:7fb479d0241c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/Makefile.in	Mon Sep 23 15:06:17 2013 -0400
+++ b/Makefile.in	Thu Sep 26 21:18:39 2013 -0400
@@ -132,6 +132,11 @@
   REQUIREMENTS += bsdtar
 endif
 
+# if we want jit (llvm) we need python
+ifeq ($(ENABLE_JIT),yes)
+  REQUIREMENTS += python
+endif
+
 LIBTOOL     := libtool
 LIBTOOLIZE  := libtoolize
 
@@ -146,6 +151,18 @@
   REQUIREMENTS += flex
   BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS))
 endif
+# Building bison for native mingw creates a bison that doesnt  
+# allow push-pull mode so disable
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  REQUIREMENTS += bison
+  BUILD_TOOLS := $(filter-out build-bison, $(BUILD_TOOLS))
+endif
+# use the msys m4 in native mingw
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  REQUIREMENTS += m4
+endif
+
+
 ifeq ($(USE_SYSTEM_GCC),yes)
   BUILD_TOOLS := $(filter-out $(BUILD_COMPILER_TOOLS), $(BUILD_TOOLS))
 endif