mirror of
https://github.com/corda/corda.git
synced 2025-03-18 01:55:19 +00:00
interpret avian.bootstrap property as a complete file name
This commit is contained in:
parent
9bcc4dd4ed
commit
74295bb707
3
makefile
3
makefile
@ -317,7 +317,8 @@ $(driver-object): $(driver-source)
|
||||
$(driver-dynamic-object): $(driver-source)
|
||||
@echo "compiling $(@)"
|
||||
@mkdir -p $(dir $(@))
|
||||
$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(name)\" -c $(<) -o $(@)
|
||||
$(cxx) $(cflags) -DBOOT_LIBRARY=\"$(so-prefix)$(name)$(so-suffix)\" \
|
||||
-c $(<) -o $(@)
|
||||
|
||||
$(boot-object): $(boot-source)
|
||||
$(compile-object)
|
||||
|
@ -448,7 +448,7 @@ class BuiltinElement: public JarElement {
|
||||
|
||||
virtual void init() {
|
||||
if (index == 0) {
|
||||
if (s->success(s->load(&library, libraryName, true))) {
|
||||
if (s->success(s->load(&library, libraryName, false))) {
|
||||
void* p = library->resolve(name);
|
||||
if (p) {
|
||||
uint8_t* (*function)(unsigned*);
|
||||
|
@ -1689,7 +1689,7 @@ Machine::Machine(System* system, Heap* heap, Finder* finder,
|
||||
not system->success(system->make(&heapLock)) or
|
||||
not system->success(system->make(&classLock)) or
|
||||
not system->success(system->make(&referenceLock)) or
|
||||
not system->success(system->load(&libraries, bootLibrary, true)))
|
||||
not system->success(system->load(&libraries, bootLibrary, false)))
|
||||
{
|
||||
system->abort();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user