ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-19 11:16:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #243 from dicej/arm-non-ios

Browse Source 
assume we can't use ARMv7 instructions on non-iOS platforms by default
This commit is contained in:
Joshua Warner 2014-04-28 09:46:48 -06:00
commit 32d25d79fd
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
makefile
View File

@ -479,6 +479,12 @@ ifeq ($(arch),arm)
endif
endif
ifneq ($(platform),darwin)
# By default, assume we can't use armv7-specific instructions on
# non-iOS platforms. Ideally, we'd detect this at runtime.
armv6=true
endif
ifeq ($(armv6),true)
cflags += -DAVIAN_ASSUME_ARMV6
endif
@ -1473,8 +1479,15 @@ debug: build
vg: build
$(library-path) $(vg) $(test-executable) $(test-args)
.PHONY: test
test: build $(build)/run-tests.sh $(build)/test.sh $(unittest-executable)
test: build-test run-test
.PHONY: build-test
build-test: build $(build)/run-tests.sh $(build)/test.sh $(unittest-executable)
.PHONY: run-test
run-test:
ifneq ($(remote-test),true)
/bin/sh $(build)/run-tests.sh
else