On Mon, Jul 21, 2014 at 09:37:07PM +0200, Peter Bex wrote:
> I've tested the patch, and it indeed seems to fix this particular
> situation. Somehow I thought this would break dynamically linked
> builds, as there's no libchicken.dll, only cygchicken-0.dll. However,
> *somehow* dynamic binaries are still linked against cygchicken-0.dll
> even with this patch.
It looks like this patch *did* introduce a new bug while fixing the
static compilation: "make check" now fails on the -deploy test, with
an error that libchicken.dll can't be copied.
That file doesn't get generated (any more?), but for some reason there
was a file by that name in my checkout on the Windows VM that I was
using. I ran into this problem while deploying in a Vista VM while
looking into another bug, where that file didn't exist yet.
Here's another horrible patch to fix this problem.
Cheers,
Peter
--
http://www.more-magic.net
>From ba1d899bf1cf1b9a3dbdbf7a27225a803a9f0307 Mon Sep 17 00:00:00 2001
From: Peter Bex <peter....@xs4all.nl>
Date: Sun, 3 Aug 2014 17:54:34 +0200
Subject: [PATCH] Fix bug in deploy mode under Cygwin introduced by
be5b0827ad02473c7fbf277b8153dabb8863e973
---
csc.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/csc.scm b/csc.scm
index 16ab65e..59556aa 100644
--- a/csc.scm
+++ b/csc.scm
@@ -120,6 +120,10 @@
(define generate-manifest #f)
(define libchicken (string-append "lib" INSTALL_LIB_NAME))
+(define dynamic-libchicken
+ (if cygwin
+ (string-append "cyg" INSTALL_LIB_NAME "-0")
+ libchicken))
(define default-library
(string-append libchicken "." library-extension))
@@ -974,7 +978,7 @@ EOF
(define (copy-libraries targetdir)
(let ((lib (make-pathname
(target-lib-path)
- libchicken
+ dynamic-libchicken
(cond (osx "dylib")
((or mingw cygwin) "dll")
(else (string-append
--
1.7.10.4
_______________________________________________
Chicken-hackers mailing list
Chicken-hackers@nongnu.org
https://lists.nongnu.org/mailman/listinfo/chicken-hackers
