From c664466634a45a5db20b3970ea7bcb73b4488744 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Wed, 17 Jan 2024 17:36:51 -0500
Subject: [PATCH] Allow specifying path to ucd data for make-target-2

---
 cross-make.sh                     | 2 +-
 src/code/warm-target-unicode.lisp | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cross-make.sh b/cross-make.sh
index f9a86f3b0..817776b7e 100755
--- a/cross-make.sh
+++ b/cross-make.sh
@@ -51,7 +51,7 @@ mv build-id.inc output
 
 # make-host-1 and copy the generated C headers to the target machine
 sh make-host-1.sh
-tar cf - src/runtime/genesis | ssh $ssh_port_opt $host cd $root \; tar xf -
+tar cf - src/runtime/genesis output/ucd | ssh $ssh_port_opt $host cd $root \; tar xf -
 
 # make-target-1 and copy back the artifacts
 ssh $ssh_port_opt $host cd $root \; $ENV sh make-target-1.sh
diff --git a/src/code/warm-target-unicode.lisp b/src/code/warm-target-unicode.lisp
index 56f6d065b..d0d5197eb 100644
--- a/src/code/warm-target-unicode.lisp
+++ b/src/code/warm-target-unicode.lisp
@@ -13,8 +13,12 @@
 
 (eval-when (:compile-toplevel :execute)
   (defun read-from-file (namestring &key (enforce-single-expr t) build-dependent)
-    (declare (ignore build-dependent))
-    (with-open-file (s namestring)
+    (declare (notinline concatenate) (ignore build-dependent))
+    (with-open-file
+        (s (concatenate 'string (if (boundp 'cl-user::*generated-sources-root*)
+                                    (symbol-value 'cl-user::*generated-sources-root*)
+                                    "")
+                        namestring))
       (let* ((result (read s))
              (eof-result (cons nil nil)))
         (unless enforce-single-expr