From cc9cb3f6d7ef49936bd24c546a24cc08dd82c34b Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Fri, 27 Oct 2017 16:46:16 -0700 Subject: [sdks] Fix autogen invocation and respect Make.config options. Not all systems will have brew's libtool force linked, so we probe for glibtool to ensure we got it. Respect DISABLE_ options. Added DISABLED_BCL. --- sdks/builds/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'sdks/builds/Makefile') diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile index d6cd2f90a8d..02779db7bae 100644 --- a/sdks/builds/Makefile +++ b/sdks/builds/Makefile @@ -3,19 +3,32 @@ include $(TOP)/sdks/paths.mk IS_RELEASE?=true +#brew's libtool is not compatible with some of the deps needed (I.E. V8) so in those systems we need to explicit add to the path +#this is due mono not being compatible with xcode's libtool, which is what's on path by default +ifeq (, $(shell which glibtoolize)) +EXTRA_PATH=$(wildcard /usr/local/Cellar/libtool/*/bin/) +endif + $(TOP)/configure: $(TOP)/configure.ac $(TOP)/autogen.sh - cd $(TOP) && NOCONFIGURE=1 ./autogen.sh + cd $(TOP) && PATH=$(EXTRA_PATH):$$PATH NOCONFIGURE=1 ./autogen.sh TARGETS= ## BCL targets +ifndef DISABLE_BCL include bcl.mk +endif ## Android targets +ifndef DISABLE_ANDROID include android.mk +endif ## iOS targets +ifndef DISABLE_IOS include ios.mk +endif + ## Generic targets .PHONY: $(foreach target,$(TARGETS),toolchain-$(target)) -- cgit v1.2.3