--- gforth/libcc.fs	2008/07/10 16:18:41	1.40
+++ gforth/libcc.fs	2008/07/14 08:09:08	1.47
@@ -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 ;
 
@@ -441,12 +443,6 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
-: open-wrappers ( -- addr )
-    lib-filename 2@ s" .la" s+
-    \ 2dup cr type
-    2dup open-lib >r
-    drop free throw r> ;
-
 : scan-back { c-addr u1 c -- c-addr u2 }
     \ the last occurence of c in c-addr u1 is at u2-1; if it does not
     \ occur, u2=0.
@@ -469,17 +465,27 @@ create gen-wrapped-types
     0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;
 
-: home-dir ( -- c-addr u )
-    s" HOME" getenv ;
-
 : libcc-named-dir ( -- c-addr u )
-    home-dir s" /.gforth/libcc-named/" s+ ;
+    libcc-named-dir-v 2@ ;
 
 : libcc-tmp-dir ( -- c-addr u )
-    home-dir s" /.gforth/libcc-tmp/" s+ ;
+    s" ~/.gforth/libcc-tmp/" ;
 
 : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
-    2over append 2swap drop free throw ;
+    2over s+ 2swap drop free throw ;
+
+: open-wrappers ( -- addr|0 )
+    lib-filename 2@ s" .la" 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
+	libcc-path open-path-file if
+	    0 exit endif
+	( wfile-id c-addr2 u2 ) rot close-file throw save-mem ( c-addr2 u2 )
+    endif
+    \ 2dup cr type
+    2dup open-lib >r
+    drop free throw r> ;
 
 : c-library-name-setup ( c-addr u -- )
     assert( c-source-file-id @ 0= )
@@ -548,13 +554,13 @@ 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+
+	[ libtool-command s"  --silent --mode=compile --tag=CC gcc-4.2 -arch x86_64 -I " s+
 	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 gcc-4.2 -arch x86_64 -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 )
@@ -632,3 +638,19 @@ clear-libs
 \G Finish and (if necessary) build the latest C library interface.
     ['] compile-wrapper-function1 is compile-wrapper-function
     compile-wrapper-function1 ;
+
+: 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
+
+:noname ( -- )
+    defers 'cold
+    init-libcc ;
+is 'cold