From fe50acb6ff5ac22801980f53f85513f3a9ce8c5f Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 10 Jun 2016 22:48:21 -0400 Subject: [PATCH] [runtime] Avoid building the tools dir when cross-compiling, some tools don't seem to compile. --- Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5e0c053956a..0df27c54ea9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,14 @@ AM_CFLAGS = $(WERROR_CFLAGS) MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples tools msvc $(docs_dir) acceptance-tests llvm +# Some tools might not build when cross-compiling +if CROSS_COMPILING +tools_dir = +else +tools_dir = tools +endif + +SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm # Keep in sync with SUBDIRS DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm -- 2.25.1