~ chicken-core (chicken-5) e064ac466cc3d994477def042c7a769ae0d27ca3
commit e064ac466cc3d994477def042c7a769ae0d27ca3
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Mar 18 12:06:39 2019 +0100
Commit: Kooda <kooda@upyum.com>
CommitDate: Mon Mar 18 14:19:08 2019 +0100
chicken-install: fix double quoting
The custom build command for several component target build scripts gets quoted twice.
This fixes ticket #1588
Signed-off-by: Kooda <kooda@upyum.com>
diff --git a/egg-compile.scm b/egg-compile.scm
index da277179..ee7ed86e 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -637,8 +637,8 @@
custom types-file inline-file)
srcdir platform)
(let* ((cmd (qs* (or (custom-cmd custom srcdir platform)
- default-csc)
- platform))
+ default-csc)
+ platform))
(sname (prefix srcdir name))
(tfile (qs* (prefix srcdir (conc types-file ".types"))
platform))
@@ -675,7 +675,7 @@
" : "
src " "
(qs* eggfile platform) " "
- (if custom (qs* cmd platform) "") " "
+ (if custom cmd "") " "
(filelist srcdir lobjs platform) " "
(filelist srcdir source-dependencies platform)
" : "
@@ -726,8 +726,9 @@
source (options '())
eggfile custom)
srcdir platform)
- (let* ((cmd (or (custom-cmd custom srcdir platform)
- default-csc))
+ (let* ((cmd (qs* (or (custom-cmd custom srcdir platform)
+ default-csc)
+ platform))
(sname (prefix srcdir name))
(ssname (and source (prefix srcdir source)))
(opts (if (null? options)
@@ -748,7 +749,7 @@
(filelist srcdir source-dependencies platform)
src " "
(qs* eggfile platform) " "
- (if custom (qs* cmd platform) "")
+ (if custom cmd "")
" : "
cmd
" -setup-mode -static -I " srcdir
@@ -765,8 +766,9 @@
source-dependencies
custom)
srcdir platform)
- (let* ((cmd (or (custom-cmd custom srcdir platform)
- default-csc))
+ (let* ((cmd (qs* (or (custom-cmd custom srcdir platform)
+ default-csc)
+ platform))
(opts (if (null? options)
default-dynamic-compilation-options
options))
@@ -783,7 +785,7 @@
" : "
src " "
(qs* eggfile platform) " "
- (if custom (qs* cmd platform) "") " "
+ (if custom cmd "") " "
(filelist srcdir source-dependencies platform)
" : "
cmd
@@ -824,7 +826,7 @@
" : "
src " "
(qs* eggfile platform) " "
- (if custom (qs* cmd platform) "") " "
+ (if custom cmd "") " "
(filelist srcdir source-dependencies platform) " "
(filelist srcdir lobjs platform)
" : "
@@ -870,7 +872,7 @@
" : "
src " "
(qs* eggfile platform) " "
- (if custom (qs* cmd platform) "") " "
+ (if custom cmd "") " "
(filelist srcdir lobjs platform) " "
(filelist srcdir source-dependencies platform)
" : "
Trap