--- gforth/libcc.fs	2009/12/27 01:00:52	1.62
+++ gforth/libcc.fs	2012/03/22 16:27:11	1.70
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -154,7 +154,7 @@ variable lib-handle-addr \ points to the
 2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file without extension
 2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
-0 value libcc-path       \ pointer to path of library directories
+Variable libcc-path      \ pointer to path of library directories
 
 defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
 ' noop is replace-rpath
@@ -466,7 +466,9 @@ create gen-wrapped-types
     \ addr points to the return type index of a c-function descriptor
     dup { descriptor }
     count { ret } count 2dup { d: pars } chars + count { d: c-name }
-    ." void " lib-modulename 2@ type ." _LTX_" descriptor wrapper-function-name 2dup type drop free throw
+    ." void "
+    [ lib-suffix s" .la" str= [IF] ] lib-modulename 2@ type ." _LTX_" [ [THEN] ]
+    descriptor wrapper-function-name 2dup type drop free throw
     .\" (GFORTH_ARGS)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
     pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"
@@ -510,7 +512,7 @@ create gen-wrapped-types
     2over s+ 2swap drop free throw ;
 
 : open-wrappers ( -- addr|0 )
-    lib-filename 2@ s" .la" s+
+    lib-filename 2@ lib-suffix s+
     2dup libcc-named-dir string-prefix? if ( c-addr u )
 	\ see if we can open it in the path
 	libcc-named-dir nip /string
@@ -594,14 +596,14 @@ 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 " s+
+	[ libtool-command s"  --silent --tag=CC --mode=compile " s+
 	  libtool-cc append s"  -I '" append
 	  s" includedir" getenv append  s" '" append ] sliteral
 	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
 	lib-filename 2@ append s" .lo" append ( c-addr u )
 	\    2dup type cr
 	2dup system drop free throw $? abort" libtool compile failed"
-	[ libtool-command s"  --silent --mode=link " s+
+	[ libtool-command s"  --silent --tag=CC --mode=link " s+
 	  libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral
 	lib-filename 2@ dirname replace-rpath s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
@@ -659,7 +661,7 @@ DEFER compile-wrapper-function ( -- )
     \G specified stack effect and calls the C function @code{c-name}.
     ['] parse-function-types (c-function) ;
 
-: c-value ( "forth-name" "c-name" "[---]" "type" -- ) \ gforth
+: c-value ( "forth-name" "c-name" "---" "type" -- ) \ gforth
     \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
     \G specified stack effect and gives the C value of @code{c-name}.
     ['] parse-value-type (c-function) ;
@@ -698,8 +700,8 @@ clear-libs
 
 : init-libcc ( -- )
     s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
-[IFDEF] make-path
-    make-path to libcc-path
+[IFDEF] $init
+    libcc-path $init
     libcc-named-dir libcc-path also-path
     [ s" libccdir" getenv ] sliteral libcc-path also-path
 [THEN]