--- gforth/libcc.fs	2008/07/12 20:14:26	1.43
+++ gforth/libcc.fs	2008/07/15 09:30:12	1.48
@@ -158,6 +158,8 @@ variable lib-handle-addr \ points to the
   here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 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
 
 : delete-file 2drop 0 ;
 
@@ -463,8 +465,6 @@ create gen-wrapped-types
     0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;
 
-2variable libcc-named-dir-v
-
 : libcc-named-dir ( -- c-addr u )
     libcc-named-dir-v 2@ ;
 
@@ -474,8 +474,6 @@ create gen-wrapped-types
 : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
     2over s+ 2swap drop free throw ;
 
-0 value libcc-path
-
 : open-wrappers ( -- addr|0 )
     lib-filename 2@ s" .la" s+
     2dup libcc-named-dir string-prefix? if ( c-addr u )
@@ -556,13 +554,15 @@ 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
+	[ libtool-command s"  --silent --mode=link --tag=CC " s+
+	  libtool-cc append s"  -module -rpath " s+ ] sliteral
 	lib-filename 2@ dirname s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
 	lib-filename 2@ append s" .la" append ( c-addr u )
@@ -643,9 +643,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