From ef8ca0014871f5e74e2b4c764c7bb70bb224229d Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Sat, 16 Jan 2016 15:54:42 +0100
Subject: [PATCH 2/4] Fix double quote wrapping of libs in csc.

Prefix should not wrap its argument in a call to "quotewrap", because
copy-libraries will use (target-lib-path), which will then be quoted,
passing it on to copy-files which will quote it once again.

This would break csc -deploy when copying libchicken.

Bug was introduced in edd4926bb4f4c97760a0e03b0d0e8210398fe967.
---
 csc.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/csc.scm b/csc.scm
index 844cf02..c921a07 100644
--- a/csc.scm
+++ b/csc.scm
@@ -85,10 +85,9 @@
 (define cross-chicken (##sys#fudge 39))
 
 (define (prefix str dir default)
-  (quotewrap
-   (if chicken-prefix
-       (make-pathname (list chicken-prefix dir) str)
-       default) ))
+  (if chicken-prefix
+      (make-pathname (list chicken-prefix dir) str)
+      default) )
 
 (define (back-slash->forward-slash path)
   (if windows-shell
@@ -105,10 +104,11 @@
   (prefix "" "share" (if host-mode INSTALL_SHARE_HOME TARGET_SHARE_HOME)))
 
 (define translator
-  (prefix "chicken" "bin"
-	  (make-pathname
-	   INSTALL_BIN_HOME
-	   CHICKEN_PROGRAM)))
+  (quotewrap
+   (prefix "chicken" "bin"
+	   (make-pathname
+	    INSTALL_BIN_HOME
+	    CHICKEN_PROGRAM))))
 
 (define compiler (quotewrap (if host-mode INSTALL_CC TARGET_CC)))
 (define c++-compiler (quotewrap (if host-mode INSTALL_CXX TARGET_CXX)))
@@ -273,10 +273,11 @@
 	   (conc " -Wl,-R"
 		 (if deployed
 		     "\\$ORIGIN"
-		     (prefix "" "lib"
-			     (if host-mode
-				 INSTALL_LIB_HOME
-				 TARGET_RUN_LIB_HOME))))))
+		     (quotewrap
+		      (prefix "" "lib"
+			      (if host-mode
+				  INSTALL_LIB_HOME
+				  TARGET_RUN_LIB_HOME)))))))
 	 (aix
 	  (list (conc "-Wl,-R\"" library-dir "\"")))
 	 (else
-- 
2.1.4