mirror of
https://github.com/corda/corda.git
synced 2025-01-06 05:04:20 +00:00
fix openjdk bootimage cross builds
We need to extract the OpenJDK classes into the build classpath directory for the target platform before running the bootimage-generator, or else it won't be able to find the classes.
This commit is contained in:
parent
70a7a50a49
commit
dec2095c63
5
makefile
5
makefile
@ -1,4 +1,4 @@
|
|||||||
MAKEFLAGS = -s
|
#MAKEFLAGS = -s
|
||||||
|
|
||||||
name = avian
|
name = avian
|
||||||
version = 0.6
|
version = 0.6
|
||||||
@ -1158,7 +1158,8 @@ $(static-library): $(vm-objects) $(classpath-objects) $(vm-heapwalk-objects) \
|
|||||||
$(ar) cru $(@) $(^)
|
$(ar) cru $(@) $(^)
|
||||||
$(ranlib) $(@)
|
$(ranlib) $(@)
|
||||||
|
|
||||||
$(bootimage-object) $(codeimage-object): $(bootimage-generator)
|
$(bootimage-object) $(codeimage-object): $(bootimage-generator) \
|
||||||
|
$(build)/classpath.jar
|
||||||
$(<) -cp $(classpath-build) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
|
$(<) -cp $(classpath-build) -bootimage $(bootimage-object) -codeimage $(codeimage-object) \
|
||||||
-bootimage-symbols _binary_bootimage_bin_start:_binary_bootimage_bin_end \
|
-bootimage-symbols _binary_bootimage_bin_start:_binary_bootimage_bin_end \
|
||||||
-codeimage-symbols _binary_codeimage_bin_start:_binary_codeimage_bin_end
|
-codeimage-symbols _binary_codeimage_bin_start:_binary_codeimage_bin_end
|
||||||
|
Loading…
Reference in New Issue
Block a user