diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-16 00:20:01 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-16 00:20:01 +0000 |
| commit | 3853f26115f242232720abb5252978de20b72c01 (patch) | |
| tree | e0a96b18cc5a91867bc99b4ade7e6345bf57f44e /src/interp | |
| parent | 1d8dbf312fdc2165430bfc73939c45f458db7f50 (diff) | |
| download | open-axiom-3853f26115f242232720abb5252978de20b72c01.tar.gz | |
Fix SF/2806053
* lisp/Makefile.in: Remove generated files when cleaning.
* interp/Makefile.pamphlet: Add executable extensions if appropriate.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/Makefile.in | 4 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 4 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 2 |
3 files changed, 5 insertions, 5 deletions
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 |