ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #495 from joshuawarner32/master

Browse Source 
Fix ios bootimage build
This commit is contained in:
Joel Dice 2016-08-12 11:57:00 -06:00 committed by GitHub
commit a2c0319af2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefile
View File

@ -1385,7 +1385,7 @@ ifneq ($(mode),fast)
host-vm-options := -$(mode) host-vm-options := -$(mode)
endif endif
host-vm = build/$(build-platform)-$(build-arch)-interpret$(host-vm-options)/libjvm.so host-vm = build/$(build-platform)-$(build-arch)-interpret$(host-vm-options)/$(so-prefix)jvm$(so-suffix)
bootimage-object = $(build)/bootimage-bin.o bootimage-object = $(build)/bootimage-bin.o
codeimage-object = $(build)/codeimage-bin.o codeimage-object = $(build)/codeimage-bin.o
@ -2180,7 +2180,12 @@ $(unittest-executable): $(unittest-executable-objects)
$(bootimage-generator): $(bootimage-generator-objects) $(vm-objects) $(bootimage-generator): $(bootimage-generator-objects) $(vm-objects)
echo building $(bootimage-generator) arch=$(build-arch) platform=$(bootimage-platform) echo building $(bootimage-generator) arch=$(build-arch) platform=$(bootimage-platform)
$(MAKE) process=interpret bootimage= bootimage-test= mode=$(mode) $(MAKE) process=interpret \
bootimage= \
bootimage-test= \
mode=$(mode) \
platform=$(bootimage-platform) \
arch=$(build-arch)
$(MAKE) mode=$(mode) \ $(MAKE) mode=$(mode) \
build=$(host-build-root) \ build=$(host-build-root) \
arch=$(build-arch) \ arch=$(build-arch) \