~ chicken-core (chicken-5) 045f1db4ee22cdbecade4a17307ae61bba8bf31d

commit 045f1db4ee22cdbecade4a17307ae61bba8bf31d
Author:     Felix <bunny351@gmail.com>
AuthorDate: Sun Nov 1 00:02:00 2009 +0100
Commit:     Felix <bunny351@gmail.com>
CommitDate: Sun Nov 1 00:02:00 2009 +0100

    chicken-install should not use setup-mode when cross-compiling

diff --git a/chicken-install.scm b/chicken-install.scm
index 08faf100..2c6e4243 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -288,7 +288,12 @@
   (define (make-install-command e+d+v)
     (conc
      *csi*
-     " -bnq -setup-mode -e \"(require-library setup-api)\" -e \"(import setup-api)\""
+     " -bnq "
+     (if (and (feature? #:cross-chicken) ; disable -setup-mode when cross-compiling,
+	      (not *host-extension*)) ; host-repo must always take precedence
+	 ""				
+	 "-setup-mode ")
+     "-e \"(require-library setup-api)\" -e \"(import setup-api)\""
      (sprintf " -e \"(extension-name-and-version '(\\\"~a\\\" \\\"~a\\\"))\"" (car e+d+v) (caddr e+d+v))
      (if (sudo-install) " -e \"(sudo-install #t)\"" "")
      (if *keep* " -e \"(keep-intermediates #t)\"" "")
diff --git a/setup-api.scm b/setup-api.scm
index 15dd945d..dd0268aa 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -225,7 +225,10 @@
 		  (make-pathname 
 		   *chicken-bin-path*
 		   (cdr (assoc prg *installed-executables*))))
-		 "-feature" "compiling-extension" "-setup-mode"
+		 "-feature" "compiling-extension" 
+		 (if (and (feature? #:cross-chicken)
+			  (not (host-extension)))
+		     "" "-setup-mode")
 		 (if (keep-intermediates) "-k" "")
 		 (if (host-extension) "-host" "")
 		 *csc-options*)