diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-12-02 06:24:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-12-02 06:24:29 +0000 |
| commit | 91e3f58e72d13cd2c3d0cf725dca5f5580ef8098 (patch) | |
| tree | 8b96b4fffd78b06034dec538a6a0eb2e7005e0e3 /src/lisp/Makefile.pamphlet | |
| parent | 3cf32a26366e7ca6065c6bf88ca66413f8815704 (diff) | |
| download | open-axiom-91e3f58e72d13cd2c3d0cf725dca5f5580ef8098.tar.gz | |
src/boot/
2007-12-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (boot_objects_extra): New.
(stage0/bootsys$(EXEEXT)): Use it.
(stage1/bootsys$(EXEEXT)): Likewise.
(stage2/bootsys$(EXEEXT)): Likewise.
src/lisp/
2007-12-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (base_lisp_objects): New. Abstract over
Lisp compilation models.
(core.$(FASLEXT)): Tidy.
* core.lisp.in (|getOutputPathname|): Make unary.
(|link|): Make sure object files are used to construct ECL
programs.
(|makeHandler|): Adjust.
(|compileLispFile|): Likewise.
Diffstat (limited to 'src/lisp/Makefile.pamphlet')
| -rw-r--r-- | src/lisp/Makefile.pamphlet | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/lisp/Makefile.pamphlet b/src/lisp/Makefile.pamphlet index 76809b71..4fe2bacd 100644 --- a/src/lisp/Makefile.pamphlet +++ b/src/lisp/Makefile.pamphlet @@ -60,11 +60,17 @@ ifeq (@axiom_lisp_flavor@,gcl) $(INSTALL_PROGRAM) lisp$(EXEEXT) $(OUT) endif +ifeq (@axiom_lisp_flavor@,ecl) +base_lisp_objects = ("core.$(OBJEXT)") +else +base_lisp_objects = nil +endif + base-lisp$(EXEEXT): core.$(FASLEXT) $(AXIOM_LISP) \ $(eval_flags) '(load "core")' \ - $(eval_flags) '(|AxiomCore|::|link| "$@" (quote nil) (function |AxiomCore|::|topLevel|))' + $(eval_flags) '(|AxiomCore|::|link| "$@" (quote $(base_lisp_objects)) (quote |AxiomCore|::|topLevel|))' axiom_optimize_options = @axiom_optimize_options@ @@ -81,10 +87,16 @@ core.lisp: $(srcdir)/core.lisp.in $(top_srcdir)/config/move-if-change $@.tmp $@ core.$(FASLEXT): core.lisp +ifeq (@axiom_lisp_flavor@,ecl) $(AXIOM_LISP) $(quiet_flags) \ - $(eval_flags) '(progn #-:ecl (compile-file "$<"))' \ - $(eval_flags) '(progn #+:ecl (progn (require (quote cmp)) (compile-file "$<" :system-p t) (c::build-fasl "$@" :lisp-files (quote ("core.$(OBJEXT)")))))' \ + $(eval_flags) '(require (quote cmp))' \ + $(eval_flags) '(compile-file "$<" :system-p t)' \ + $(eval_flags) '(c::build-fasl "$@" :lisp-files (quote ("core.$(OBJEXT)")))' \ $(eval_flags) '(quit)' +else + $(AXIOM_LISP) $(quiet_flags) \ + $(eval_flags) '(progn (compile-file "$<") (quit))' +endif @ |