From 81c7320f7b89dda21843fb9d88d2878d5bd723c0 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 5 Nov 2008 05:14:35 -0600
Subject: [PATCH] mason.updates was calling download-my-image, which uses the
 current CPU/OS instead of target-cpu and target-os. So doing 32-bit builds
 from a 64-bit Factor instance didn't work... oops

---
 extra/mason/platform/platform.factor | 12 +++++-------
 extra/mason/updates/updates.factor   |  3 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/extra/mason/platform/platform.factor b/extra/mason/platform/platform.factor
index e4bba51491..cd7d3f3836 100644
--- a/extra/mason/platform/platform.factor
+++ b/extra/mason/platform/platform.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel system accessors namespaces splitting sequences make
+USING: kernel system accessors namespaces splitting sequences
 mason.config ;
 IN: mason.platform
 
@@ -10,10 +10,8 @@ IN: mason.platform
 : gnu-make ( -- string )
     target-os get { "freebsd" "openbsd" "netbsd" } member? "gmake" "make" ? ;
 
+: boot-image-arch ( -- string )
+    target-cpu get dup "ppc" = [ target-os get "-" append prepend ] when ;
+
 : boot-image-name ( -- string )
-    [
-        "boot." %
-        target-cpu get "ppc" = [ target-os get % "-" % ] when
-        target-cpu get %
-        ".image" %
-    ] "" make ;
+    "boot." boot-image-arch ".image" 3append ;
diff --git a/extra/mason/updates/updates.factor b/extra/mason/updates/updates.factor
index 9c42ba2850..b3f6847c35 100644
--- a/extra/mason/updates/updates.factor
+++ b/extra/mason/updates/updates.factor
@@ -20,7 +20,8 @@ IN: mason.updates
     = not ;
 
 : new-image-available? ( -- ? )
-    boot-image-name need-new-image? [ download-my-image t ] [ f ] if ;
+    boot-image-name need-new-image?
+    [ boot-image-arch download-image t ] [ f ] if ;
 
 : new-code-available? ( -- ? )
     updates-available?