diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-03-26 05:57:19 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-03-26 05:57:19 +0000 |
| commit | c98e47a0c148103da65955acfb3782e37a8fc4c3 (patch) | |
| tree | f4a461581ed5e50201e1df586e8156873f1e1458 /src/boot | |
| parent | 68c6afce19df6a92b0569a23bcfe3a73f109b754 (diff) | |
| download | open-axiom-c98e47a0c148103da65955acfb3782e37a8fc4c3.tar.gz | |
Fix shared linking regression
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/Makefile.in | 10 | ||||
| -rw-r--r-- | src/boot/translator.boot | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in index 756d59c6..f8d57bd9 100644 --- a/src/boot/Makefile.in +++ b/src/boot/Makefile.in @@ -80,14 +80,14 @@ all: all-ax all-boot all-ax all-boot: stamp -stamp: $(axiom_build_bindir)/bootsys$(EXEEXT) +stamp: $(axiom_target_bindir)/bootsys$(EXEEXT) @rm -f stamp $(STAMP) $@ ## The final `bootsys' image. -$(axiom_build_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT) - $(mkinstalldirs) $(axiom_build_bindir) - $(INSTALL_PROGRAM) stage2/bootsys$(EXEEXT) $(axiom_build_bindir) +$(axiom_target_bindir)/bootsys$(EXEEXT): stage2/bootsys$(EXEEXT) + $(mkinstalldirs) $(axiom_target_bindir) + $(INSTALL_PROGRAM) $< $@ .PRECIOUS: strap/%.$(FASLEXT) @@ -209,7 +209,7 @@ stage2/%.clisp: %.boot stage1/stamp stage2/.started ## mostlyclean-local: - @rm -f $(axiom_build_bindir)/bootsys$(EXEEXT) + @rm -f $(axiom_target_bindir)/bootsys$(EXEEXT) @rm -rf prev-stage @rm -rf strap stage1 stage2 @rm -f *.data *.fn diff --git a/src/boot/translator.boot b/src/boot/translator.boot index d5020cf2..b5245d92 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -835,5 +835,5 @@ $OpenAxiomCoreModuleLoaded := false loadSystemRuntimeCore() == $OpenAxiomCoreModuleLoaded => nil loadNativeModule strconc(systemLibraryDirectory(), - '"libopen-axiom-core.so") + '"libopen-axiom-core",$NativeModuleExt) $OpenAxiomCoreModuleLoaded := true |