From fbe2094f56fb81c888076c781e90fb0abbc0cc07 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 30 Jul 2022 07:06:55 -0600 Subject: [PATCH 1/2] CS makefiles: fix Unix-style install for cross compilation Closes #4377 (cherry picked from commit 053be470e7c5454cdf48e934f3254d2d916bbbc5) --- racket/src/cs/c/build.zuo | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo index 8d3950bb27..d8b74c509d 100644 --- a/racket/src/cs/c/build.zuo +++ b/racket/src/cs/c/build.zuo @@ -1016,10 +1016,9 @@ (define (setup) (call-with-dest-racket (lambda (bindir dest-racket) - (define copytree-racket (and cross? (config-bootstrap-racket))) + (define copytree-racket (and cross? (hash-ref (config-bootstrap-racket) 'racket))) (maybe-copytree config dest-racket copytree-racket at-dir) - (run-raco-setup config dest-racket - (and cross? (hash-ref (config-bootstrap-racket) 'racket)) + (run-raco-setup config dest-racket copytree-racket ;; this can be redundant if it's also supplied via `SETUP_MACHINE_FLAGS`, ;; but redundant should be ok: (list "-MCR" (~a (at-dir "compiled") ":") -- 2.32.0