interpret avian.bootstrap property as a complete file name

This commit is contained in:
Joel Dice 2008-03-31 12:57:49 -06:00
parent 9bcc4dd4ed
commit 74295bb707
3 changed files with 4 additions and 3 deletions

View File

@ -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)

View File

@ -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*);

View File

@ -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();
}