~ chicken-core (chicken-5) 7bf5eceb0a1f1d1284529036e3dfb7ac12d002d3

commit 7bf5eceb0a1f1d1284529036e3dfb7ac12d002d3
Author:     Evan Hanson <evhan@foldling.org>
AuthorDate: Fri Jan 17 14:30:59 2014 +1300
Commit:     Christian Kellermann <ckeen@pestilenz.org>
CommitDate: Fri Jan 17 10:48:03 2014 +0100

    Pass "-z origin" as a linker option for deployed binaries on FreeBSD
    
    Thanks to Jules Altfas and Vitaly Magerya for the report and suggested fix.
    
    Signed-off-by: Christian Kellermann <ckeen@pestilenz.org>

diff --git a/NEWS b/NEWS
index 7592ce4b..4e89a4e1 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@
   - The procedure trace buffer has been made resizable.
   - C_zap_strings and ##sys#zap-strings (undocumented) have been deprecated.
 
+- Tools
+  - csc: "-z origin" is now passed as a linker option on FreeBSD when
+    compiling for deployment (thanks to Jules Altfas & Vitaly Magerya)
+
 - Core libraries
   - Unit extras now implicitly depends on ports.  ports no longer
      implicitly depends on extras.  This may break programs which don't
diff --git a/csc.scm b/csc.scm
index 74d1d8b6..935687f6 100644
--- a/csc.scm
+++ b/csc.scm
@@ -277,7 +277,7 @@
 	 (else
 	  (list (conc "-L\"" library-dir "\""))))
    (if (and deployed (eq? (software-version) 'freebsd))
-       (list "-z origin")
+       (list "-Wl,-z,origin")
        '())
    (cond ((get-environment-variable "CHICKEN_C_LIBRARY_PATH") => 
 	  (lambda (path)