--- gforth/libcc.fs	2008/07/13 19:20:54	1.44
+++ gforth/libcc.fs	2008/08/09 20:44:03	1.53
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -136,8 +136,6 @@
 
 require struct.fs
 
-    \ counted-string
-    
 \ c-function-ft word body:
 struct
     cell% field cff-cfr \ xt of c-function-rt word
@@ -161,7 +159,8 @@ variable lib-handle-addr \ points to the
 2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
 0 value libcc-path       \ pointer to path of library directories
 
-: delete-file 2drop 0 ;
+defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
+' noop is replace-rpath
 
 : .nb ( n -- )
     0 .r ;
@@ -227,7 +226,7 @@ end-struct c-lib%
 
 variable c-libs \ linked list of library names (without "lib")
 
-: add-lib ( c-addr u -- )
+: add-lib ( c-addr u -- ) \ gforth
 \G Add library lib@i{string} to the list of libraries, where
 \G @i{string} is represented by @i{c-addr u}.
     c-lib% %size allocate throw dup >r
@@ -554,14 +553,16 @@ DEFER compile-wrapper-function ( -- )
     lib-handle 0= if
 	c-source-file close-file throw
 	0 c-source-file-id !
-	[ libtool-command s"  --silent --mode=compile gcc -I " s+
-	s" includedir" getenv append ] sliteral
+	[ libtool-command s"  --silent --mode=compile --tag=CC " s+
+	  libtool-cc append s"  -I " append
+	  s" includedir" getenv append ] sliteral
 	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
 	lib-filename 2@ append s" .lo" append ( c-addr u )
 	\    cr 2dup type
 	2dup system drop free throw $? abort" libtool compile failed"
-	[ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
-	lib-filename 2@ dirname s+ s"  " append
+	[ libtool-command s"  --silent --mode=link --tag=CC " s+
+	  libtool-cc append s"  -module -rpath " s+ ] sliteral
+	lib-filename 2@ dirname replace-rpath s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
 	lib-filename 2@ append s" .la" append ( c-addr u )
 	c-libs @ ['] append-l list-map
@@ -613,7 +614,7 @@ DEFER compile-wrapper-function ( -- )
     defer lastxt dup c-function-rt lastxt c-function-ft
     lastxt swap defer! ;
 
-: clear-libs ( -- )
+: clear-libs ( -- ) \ gforth
 \G Clear the list of libs
     c-source-file-id @ if
 	compile-wrapper-function
@@ -641,9 +642,11 @@ clear-libs
 
 : init-libcc ( -- )
     s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
+[IFDEF] make-path
     make-path to libcc-path
     libcc-named-dir libcc-path also-path
     [ s" libccdir" getenv ] sliteral libcc-path also-path
+[THEN]
 ;
 
 init-libcc