From b1efcd1fc2f8c5b5274ee1cac4e32898691d0e3c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 20 Jul 2010 07:15:31 -0600 Subject: [PATCH] fix non-in-place install by propagating collects path to subprocesses Merge to 5.0.1 --- collects/setup/parallel-build.rkt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/collects/setup/parallel-build.rkt b/collects/setup/parallel-build.rkt index 92a80af3d6..dd311faf7f 100644 --- a/collects/setup/parallel-build.rkt +++ b/collects/setup/parallel-build.rkt @@ -17,8 +17,7 @@ (initial-queue jobqueue)) (define (process-comp jobqueue nprocs stopat) - (define process-worker-filename - (path->string (build-path (collection-path "setup") "parallel-build-worker.rkt"))) + (define process-worker-library "setup/parallel-build-worker") (define executable (parameterize ([current-directory (find-system-path 'orig-dir)]) (find-executable-path (find-system-path 'exec-file) #f))) @@ -26,7 +25,12 @@ (write x ch) (flush-output ch)) (define (spawn i) - (let-values ([(s o in e) (subprocess #f #f (current-error-port) executable process-worker-filename)]) + (let-values ([(s o in e) (subprocess #f #f (current-error-port) + executable + "-X" + (path->string (find-system-path 'collects-dir)) + "-l" + process-worker-library)]) (send/msg i in) (list i s o in e))) (define (kill-worker i nw o in)