From 613a2c9ff42cd1ee6b6ada582dff4beab82ca376 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 15 Nov 2023 10:56:31 -0700 Subject: repair install of a builtpkgs build (cherry picked from commit 7ed81eba162ba6af41e7522d54231df09b7ff186) --- racket/src/bc/build.zuo | 3 ++- racket/src/cs/c/build.zuo | 3 ++- racket/src/lib.zuo | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/racket/src/bc/build.zuo b/racket/src/bc/build.zuo index 5af471ba8c..98b6ea34f3 100644 --- a/racket/src/bc/build.zuo +++ b/racket/src/bc/build.zuo @@ -637,7 +637,8 @@ (define (setup-prepare-to-here?) (and (equal? (lookup 'MAKE_COPYTREE) "copytree") - (not cross?))) + (not cross?) + (not (in-builtpkgs-distro?)))) (define the-targets (append diff --git a/racket/src/cs/c/build.zuo b/racket/src/cs/c/build.zuo index 451e2c8c2a..c47649f206 100644 --- a/racket/src/cs/c/build.zuo +++ b/racket/src/cs/c/build.zuo @@ -373,7 +373,8 @@ (define (setup-prepare-to-here?) (and (equal? (lookup 'MAKE_COPYTREE) "copytree") - (not cross?))) + (not cross?) + (not (in-builtpkgs-distro?)))) (define the-targets (make-targets diff --git a/racket/src/lib.zuo b/racket/src/lib.zuo index 80c5c88c94..64c41b6c7a 100644 --- a/racket/src/lib.zuo +++ b/racket/src/lib.zuo @@ -42,6 +42,7 @@ strip-lib-debug run-raco-setup raco-setup-prepare-to-here + in-builtpkgs-distro? install-license-files maybe-copytree @@ -494,6 +495,9 @@ built-racket #f '())) +(define (in-builtpkgs-distro?) + (file-exists? (at-source "../collects/racket/compiled/base_rkt.zo"))) + (define (install-license-files sharepltdir) (mkdir-p sharepltdir) (for-each (lambda (path) -- cgit v1.2.3