ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 02:09:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

assume we can't use ARMv7 instructions on non-iOS platforms by default

Browse Source 
The only Linux/ARM machine I have access to does not support ARMv7.  I
don't know how common that is in general, but this seems like the safe
default.  You can always override it on the command line.

I've also broken the test target into build-test and run-test
subtargets, which can be useful when you're building on a shared
filesystem and running the tests on another machine (without using the
remote-test-host option).  If there's clock skew, the other machine
might try to rebuild stuff unecessarily.  Using run-test avoids
that.
This commit is contained in:
Joel Dice 2014-04-22 11:09:41 -06:00
parent 5beb148df3
commit 2501929ccc
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

@ -471,6 +471,12 @@ ifeq ($(arch),arm)
endif endif
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) ifeq ($(armv6),true)
cflags += -DAVIAN_ASSUME_ARMV6 cflags += -DAVIAN_ASSUME_ARMV6
endif endif
@ -1465,8 +1471,15 @@ debug: build
vg: build vg: build
$(library-path) $(vg) $(test-executable) $(test-args) $(library-path) $(vg) $(test-executable) $(test-args)
.PHONY: test .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) ifneq ($(remote-test),true)
/bin/sh $(build)/run-tests.sh /bin/sh $(build)/run-tests.sh
else else