From 20728278bf95b9ec1313af9298de68d381d9f330 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 25 Jul 2015 16:24:43 -0600 Subject: [PATCH] raco setup: fix bootstrap phase to recognize indirect dependencies Recent changes introduced an indirect dependency in the core of `raco setup` --- possibly the recent addition to `racket/place`. --- racket/collects/setup/main.rkt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/racket/collects/setup/main.rkt b/racket/collects/setup/main.rkt index a7055f3832..3877ac9bf7 100644 --- a/racket/collects/setup/main.rkt +++ b/racket/collects/setup/main.rkt @@ -147,9 +147,14 @@ (bytes->path (regexp-replace #"[.]zo$" (path->bytes path) #".dep")) read)]) (for-each (lambda (dep) - (unless (and (pair? dep) - (eq? (car dep) 'ext)) - (dynamic-require (main-collects-relative->path dep) #f))) + (let ([dep + (if (and (pair? dep) + (eq? (car dep) 'indirect)) + (cdr dep) + dep)]) + (unless (and (pair? dep) + (eq? (car dep) 'ext)) + (dynamic-require (main-collects-relative->path dep) #f)))) (cddr deps)))) ;; Not a .zo! Don't use .zo files at all... (escape (lambda ()