fix non-in-place install by propagating collects path to subprocesses
Merge to 5.0.1
This commit is contained in:
parent
310f9ce05a
commit
b1efcd1fc2
|
@ -17,8 +17,7 @@
|
||||||
(initial-queue jobqueue))
|
(initial-queue jobqueue))
|
||||||
|
|
||||||
(define (process-comp jobqueue nprocs stopat)
|
(define (process-comp jobqueue nprocs stopat)
|
||||||
(define process-worker-filename
|
(define process-worker-library "setup/parallel-build-worker")
|
||||||
(path->string (build-path (collection-path "setup") "parallel-build-worker.rkt")))
|
|
||||||
|
|
||||||
(define executable (parameterize ([current-directory (find-system-path 'orig-dir)])
|
(define executable (parameterize ([current-directory (find-system-path 'orig-dir)])
|
||||||
(find-executable-path (find-system-path 'exec-file) #f)))
|
(find-executable-path (find-system-path 'exec-file) #f)))
|
||||||
|
@ -26,7 +25,12 @@
|
||||||
(write x ch)
|
(write x ch)
|
||||||
(flush-output ch))
|
(flush-output ch))
|
||||||
(define (spawn i)
|
(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)
|
(send/msg i in)
|
||||||
(list i s o in e)))
|
(list i s o in e)))
|
||||||
(define (kill-worker i nw o in)
|
(define (kill-worker i nw o in)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user