--- gforth/libcc.fs 2009/12/27 01:00:52 1.62 +++ gforth/libcc.fs 2010/12/31 14:37:13 1.66 @@ -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 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 @@ -594,14 +594,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 @@ -698,8 +698,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]