mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

fix bootstrapping after last night's psyntax patch

Browse source 
* module/Makefile.am (ice-9/psyntax-pp.scm): Don't try autocompiling when
  making psyntax-pp.scm.

* module/ice-9/psyntax-pp.scm: Regenerated.

* module/ice-9/psyntax.scm (chi-top): Only affect the compile-time
  environment if modules have booted.
This commit is contained in:
Andy Wingo 2009-06-08 01:04:16 +02:00
parent f4aa8d53a0
commit 55dce020bd
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/Makefile.am
View file

@ -62,7 +62,7 @@ EXTRA_DIST += ice-9/test.scm ice-9/compile-psyntax.scm ice-9/ChangeLog-2008
# GUILE_LOAD_PATH=/usr/local/share/guile/1.5.4 make psyntax-pp.scm
include $(top_srcdir)/am/pre-inst-guile
ice-9/psyntax-pp.scm: ice-9/psyntax.scm
$(preinstguile) -s $(srcdir)/ice-9/compile-psyntax.scm \
$(preinstguile) --no-autocompile -s $(srcdir)/ice-9/compile-psyntax.scm \
$(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
SCHEME_LANG_SOURCES = \

22
module/ice-9/psyntax-pp.scm
View file

File diff suppressed because one or more lines are too long

5
module/ice-9/psyntax.scm
View file

@ -1178,8 +1178,9 @@
(type (binding-type (lookup n r mod))))
(case type
((global core macro module-ref)
;; affect compile-time environment
(if (not (module-local-variable (current-module) n))
;; affect compile-time environment (once we have booted)
(if (and (not (module-local-variable (current-module) n))
(current-module))
(module-define! (current-module) n #f))
(eval-if-c&e m
(build-global-definition s n (chi e r w mod))