From c4df79b38d7add1131b82ade67a2b4c624bc4680 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 28 Sep 2020 19:10:10 -0600 Subject: [PATCH] cs windows: add dependencies on petite.so and scheme.so Originally, the dependency was expressed via "compile-file.ss", but now the dependency can be more direct. --- racket/src/worksp/csbuild.rkt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/racket/src/worksp/csbuild.rkt b/racket/src/worksp/csbuild.rkt index a9c076c885..fe1b07a024 100644 --- a/racket/src/worksp/csbuild.rkt +++ b/racket/src/worksp/csbuild.rkt @@ -129,10 +129,13 @@ ;; ---------------------------------------- (define scheme (build-path scheme-dir machine "bin" machine "scheme.exe")) -(define rel-scheme (build-path 'up "worksp" - (if (relative-path? scheme) - scheme - (find-relative-path (current-directory) scheme)))) +(define scheme-boot (build-path scheme-dir machine "boot" machine)) +(define (path->relative p) + (if (relative-path? p) + p + (find-relative-path (current-directory) p))) +(define rel-scheme (build-path 'up "worksp" (path->relative scheme))) +(define rel-scheme-boot (build-path 'up "worksp" (path->relative scheme-boot))) (parameterize ([current-directory (build-path 'up "cs")]) (define convert.d (build-path build-dir "compiled" "convert.d")) @@ -143,7 +146,8 @@ (format "SCHEME=~a" rel-scheme) (format "BUILDDIR=../build/") ; need forward slashes (format "CONVERT_RACKET=~a" chain-racket) - (format "BOOTSTRAPPED=~a" "done"))) + (format "BOOTSTRAPPED=~a" "done") + (format "EXTRA_COMPILE_DEPS=~a/petite.boot ~a/scheme.boot" rel-scheme-boot rel-scheme-boot))) ;; ----------------------------------------