Merge pull request #475 from majestrate/master

don't die when running make CROSS=ON
5 years ago · 26fd6cb846
parent eed955db90 d14e214e28
commit 26fd6cb846
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -177,7 +177,7 @@ testnet:
 $(TEST_EXE): debug

 test: $(TEST_EXE)
-	test x$(CROSS) = xOFF && $(TEST_EXE)
+	test x$(CROSS) = xOFF && $(TEST_EXE) || test x$(CROSS) = xON

 android-gradle-prepare:
 	rm -f $(ANDROID_PROPS)
@ -261,7 +261,7 @@ debian: debian-configure
 	cp $(EXE) lokinet

 debian-test:
-	test x$(CROSS) = xOFF && $(TEST_EXE) || true
+	test x$(CROSS) = xOFF && $(TEST_EXE) || test x$(CROSS) = xON

 install:
 	$(MAKE) -C '$(BUILD_ROOT)' install