diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 4 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 4 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 | ||||
| -rw-r--r-- | src/lisp/Makefile.in | 10 |
5 files changed, 17 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ea4326bd..6771ef28 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2009-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + Fix SF/2806053 + * lisp/Makefile.in: Remove generated files when cleaning. + * interp/Makefile.pamphlet: Add executable extensions if appropriate. + +2009-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (spadCompileOrSetq): Tidy. * interp/fnewmeta.lisp (PARSE-Sexpr1): Disable negative integers in data. A facility not actually used in Spad code. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 5ac93c59..c5200ddc 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -10,9 +10,9 @@ autoload_objects = # Build platform-dependent Lisp image, at the base of other # derived Lisp images (interpsys, AXIOMsys) -LISPSYS= $(axiom_build_bindir)/lisp +LISPSYS= $(axiom_build_bindir)/lisp$(EXEEXT) -BOOTSYS= $(axiom_target_bindir)/bootsys -- --syslib=$(axiom_target_libdir) +BOOTSYS= $(axiom_target_bindir)/bootsys$(EXEEXT) -- --syslib=$(axiom_target_libdir) SAVESYS= interpsys$(EXEEXT) AXIOMSYS= $(axiom_target_bindir)/AXIOMsys$(EXEEXT) diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index 846fcca9..90d9aa85 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -62,7 +62,7 @@ build platform sub-directory. <<environment>>= # Build platform-dependent Lisp image, at the base of other # derived Lisp images (interpsys, AXIOMsys) -LISPSYS= $(axiom_build_bindir)/lisp +LISPSYS= $(axiom_build_bindir)/lisp$(EXEEXT) @ @@ -76,7 +76,7 @@ itself to bootstrap the system). This image is assumed to have been built (on the build platform) by a previous step in the make process. <<environment>>= -BOOTSYS= $(axiom_target_bindir)/bootsys -- --syslib=$(axiom_target_libdir) +BOOTSYS= $(axiom_target_bindir)/bootsys$(EXEEXT) -- --syslib=$(axiom_target_libdir) @ diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 43433524..9d79c3b3 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1224,7 +1224,7 @@ canReturn(expr,level,exitCount,ValueFlag) == --SPAD: exit and friends and/[canReturn(u,level,exitCount,ValueFlag) for u in expr] op = "LET" or op = "LET*" => or/[canReturn(init,level,exitCount,false) for [.,init] in second expr] - or canReturn(third expr,exitCount,ValueFlag) + or canReturn(third expr,level,exitCount,ValueFlag) systemErrorHere ['"canReturn",expr] --for the time being ++ We are compiling a conditional expression, type check and generate diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index 94d88729..734d114d 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008, Gabriel Dos Reis. +# Copyright (C) 2007-2009, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -122,7 +122,7 @@ base-lisp$(EXEEXT): core.$(FASLEXT) $(oa_base_lisp_linkset) $(eval_flags) '(load "core")' \ $(eval_flags) '(|AxiomCore|::|link| "$@" (quote $(base_lisp_objects)) "|AxiomCore|::|topLevel|")' -$(oa_base_lisp_linkset): $(oa_target_lispdir)/core.$(LNKEXT) +$(oa_target_lispdir)/linkset: $(oa_target_lispdir)/core.$(LNKEXT) rm -f $@ echo '$(base_lisp_objects)' > $@ @@ -173,8 +173,10 @@ endif mostlyclean-local: - rm -f *.$(FASLEXT) - @rm -f $(OUT)/lisp$(EXEEXT) lisp$(EXEEXT) + rm -f core.$(FASLEXT) core.$(OBJEXT) core.lisp + @if test -n "$(oa_base_lisp_linkset)"; then \ + rm -f $(oa_base_lisp_linkset); fi + @rm -f $(OUT)/lisp$(EXEEXT) lisp$(EXEEXT) base-lisp$(EXEEXT) rm -rf $(oa_target_lispdir) @rm -f stamp |