summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/guile
diff options
context:
space:
mode:
authorEric Blossom2010-12-03 14:32:15 -0800
committerEric Blossom2010-12-03 14:32:15 -0800
commit63728823a570a305a18d462dae2d07ba77d520fd (patch)
treedcb023ac5cef854d81752e48f9e9bf4db30047b9 /gnuradio-core/src/guile
parent6f1a20284530b20ee3e318cd2fc6724e65b96a14 (diff)
downloadgnuradio-63728823a570a305a18d462dae2d07ba77d520fd.tar.gz
gnuradio-63728823a570a305a18d462dae2d07ba77d520fd.tar.bz2
gnuradio-63728823a570a305a18d462dae2d07ba77d520fd.zip
Revert "Add "shims" for booting (mostly) from magic file system"
This reverts commit 9bc62cca21a0a171cbc220419af91b3d8f7e333b. This stragegy didn't work. Our new gsubrs have not yet be defined when the ice-9/boot-9.scm code is loaded.
Diffstat (limited to 'gnuradio-core/src/guile')
-rw-r--r--gnuradio-core/src/guile/+boot+/ice-9/boot-9.scm27
-rw-r--r--gnuradio-core/src/guile/Makefile.am1
2 files changed, 0 insertions, 28 deletions
diff --git a/gnuradio-core/src/guile/+boot+/ice-9/boot-9.scm b/gnuradio-core/src/guile/+boot+/ice-9/boot-9.scm
deleted file mode 100644
index 4926c6f3c..000000000
--- a/gnuradio-core/src/guile/+boot+/ice-9/boot-9.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-;;; install shims for magic file system (if defined), then chain to real boot code.
-
-(if (defined? 'xyzzy-primitive-load)
- (set! primitive-load xyzzy-primitive-load))
-
-(if (defined? 'xyzzy-primitive-load-path)
- (set! primitive-load-path xyzzy-primitive-load-path))
-
-(if (defined? 'xyzzy-search-path)
- (set! search-path xyzzy-search-path))
-
-(if (defined? 'xyzzy-search-load-path)
- (set! search-load-path xyzzy-search-load-path))
-
-;; Remove any path containing /+boot+ from %load-path
-(set! %load-path
- (let ((new-path '()))
- (let loop ((path %load-path))
- (cond ((not (pair? path))
- (reverse! new-path))
- ((string-contains (car path) "/+boot+")
- (loop (cdr path)))
- (else
- (set! new-path (cons (car path) new-path))
- (loop (cdr path)))))))
-
-(primitive-load-path "ice-9/boot-9.scm")
diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am
index cebef89f1..447500b46 100644
--- a/gnuradio-core/src/guile/Makefile.am
+++ b/gnuradio-core/src/guile/Makefile.am
@@ -39,7 +39,6 @@ SUBDIRS = example-waveforms
# gnuradio/runtime-shim implements "guile friendly" versions of connect & disconnect.
nobase_guile_DATA = \
- +boot+/ice-9/boot-9.scm \
Swig/common.scm \
gnuradio/core.scm \
gnuradio/export-safely.scm \