aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2013-06-01 07:35:18 +0000
committerdos-reis <gdr@axiomatics.org>2013-06-01 07:35:18 +0000
commit64aeafac79d72f440b6546bae91583e6efd6b674 (patch)
treede419861e4625d20bc0e1c68f5db1590a50708b9 /src/algebra
parentde3a19c35df30298d323c5882e39931f329ea29e (diff)
downloadopen-axiom-64aeafac79d72f440b6546bae91583e6efd6b674.tar.gz
Support --output in compiler, for bootstrapping stage.
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/Makefile.am24
-rw-r--r--src/algebra/Makefile.in24
2 files changed, 10 insertions, 38 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index ae00743b..3c404d0d 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -1007,31 +1007,17 @@ strap-0 strap-1 strap-2:
.PRECIOUS: strap-0/%.$(FASLEXT)
strap-0/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-0
- $(BOOTSTRAP) --sysalg=strap-0 --bootstrap $< \
- && cp $*.NRLIB/code.$(FASLEXT) $@ && \
- if test x@oa_keep_files@ = xyes; then \
- cp $*.NRLIB/code.lsp strap-0/$*.lsp; fi && \
- rm -rf $*.NRLIB
+ $(BOOTSTRAP) --sysalg=strap-0 --output=$@ --bootstrap $<
.PRECIOUS: strap-1/%.$(FASLEXT)
strap-1/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-1
- $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 --optimize=3 $< && \
- cp $*.NRLIB/code.$(FASLEXT) $@ && \
- if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \
- strap-1/$*-.$(FASLEXT); else : ; fi && \
- if test x@oa_keep_files@ = xyes; then \
- cp $*.NRLIB/code.lsp strap-1/$*.lsp; fi && \
- rm -rf $*.NRLIB $*-.NRLIB
+ $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 \
+ --output=$@ --optimize=3 $<
.PRECIOUS: strap-2/%.$(FASLEXT)
strap-2/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-2
- $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 --optimize=3 $< && \
- cp $*.NRLIB/code.$(FASLEXT) $@ && \
- if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \
- strap-2/$*-.$(FASLEXT); else : ; fi && \
- if test x@oa_keep_files@ = xyes; then \
- cp $*.NRLIB/code.lsp strap-2/$*.lsp; fi && \
- rm -rf $*.NRLIB $*-.NRLIB
+ $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 \
+ --output=$@ --optimize=3 $<
SPADFILES= \
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 5fd78ad2..785aaa17 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -2512,31 +2512,17 @@ strap-0 strap-1 strap-2:
.PRECIOUS: strap-0/%.$(FASLEXT)
strap-0/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-0
- $(BOOTSTRAP) --sysalg=strap-0 --bootstrap $< \
- && cp $*.NRLIB/code.$(FASLEXT) $@ && \
- if test x@oa_keep_files@ = xyes; then \
- cp $*.NRLIB/code.lsp strap-0/$*.lsp; fi && \
- rm -rf $*.NRLIB
+ $(BOOTSTRAP) --sysalg=strap-0 --output=$@ --bootstrap $<
.PRECIOUS: strap-1/%.$(FASLEXT)
strap-1/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-1
- $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 --optimize=3 $< && \
- cp $*.NRLIB/code.$(FASLEXT) $@ && \
- if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \
- strap-1/$*-.$(FASLEXT); else : ; fi && \
- if test x@oa_keep_files@ = xyes; then \
- cp $*.NRLIB/code.lsp strap-1/$*.lsp; fi && \
- rm -rf $*.NRLIB $*-.NRLIB
+ $(BOOTSTRAP) --strap=strap-0 --sysalg=strap-1 \
+ --output=$@ --optimize=3 $<
.PRECIOUS: strap-2/%.$(FASLEXT)
strap-2/%.$(FASLEXT): %.spad initdb.$(FASLEXT) | strap-2
- $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 --optimize=3 $< && \
- cp $*.NRLIB/code.$(FASLEXT) $@ && \
- if test -d $*-.NRLIB; then cp $*-.NRLIB/code.$(FASLEXT) \
- strap-2/$*-.$(FASLEXT); else : ; fi && \
- if test x@oa_keep_files@ = xyes; then \
- cp $*.NRLIB/code.lsp strap-2/$*.lsp; fi && \
- rm -rf $*.NRLIB $*-.NRLIB
+ $(BOOTSTRAP) --strap=strap-1 --sysalg=strap-2 \
+ --output=$@ --optimize=3 $<
# The root of the category hierarchy is the Type category.
# We require the basic integer domains are available at stage 2 of