summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-02-28 22:37:24 +0200
committerTor Lillqvist <tml@iki.fi>2013-02-28 22:37:24 +0200
commit0f599b89a744defa80dcec1859df41670bac519e (patch)
treeae600b477abe81d6b70990c775efedec477aa387
parent0109a5b04ec4fc3a31d941faa9ea7c9f37590c49 (diff)
Fix Android and iOS build when SRCDIR!=BUILDDIR
Change-Id: I8906b736551c6ca9f96fec2df9d4b7fd12198f00
-rw-r--r--Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index c9f8ccf61db9..13c960ed053b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -185,10 +185,10 @@ bootstrap: compilerplugins
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build all slowcheck
ifeq ($(OS),ANDROID)
- cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) android
endif
ifeq ($(OS),IOS)
- cd ios && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif
build-nocheck : export SKIP_TESTS := YES