Diff for /gforth/libcc.fs between versions 1.43 and 1.47

version 1.43, 2008/07/12 20:14:26 version 1.47, 2008/07/14 08:09:08
Line 158  variable lib-handle-addr \ points to the Line 158  variable lib-handle-addr \ points to the
   here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works    here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 2variable lib-filename   \ filename without extension  2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file 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 ;  : delete-file 2drop 0 ;
   
Line 463  create gen-wrapped-types Line 465  create gen-wrapped-types
     0 <<# ['] #s $10 base-execute #>       0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;      s" gforth_c_" 2swap s+ #>> ;
   
 2variable libcc-named-dir-v  
   
 : libcc-named-dir ( -- c-addr u )  : libcc-named-dir ( -- c-addr u )
     libcc-named-dir-v 2@ ;      libcc-named-dir-v 2@ ;
   
Line 474  create gen-wrapped-types Line 474  create gen-wrapped-types
 : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )  : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
     2over s+ 2swap drop free throw ;      2over s+ 2swap drop free throw ;
   
 0 value libcc-path  
   
 : open-wrappers ( -- addr|0 )  : open-wrappers ( -- addr|0 )
     lib-filename 2@ s" .la" s+      lib-filename 2@ s" .la" s+
     2dup libcc-named-dir string-prefix? if ( c-addr u )      2dup libcc-named-dir string-prefix? if ( c-addr u )
Line 556  DEFER compile-wrapper-function ( -- ) Line 554  DEFER compile-wrapper-function ( -- )
     lib-handle 0= if      lib-handle 0= if
         c-source-file close-file throw          c-source-file close-file throw
         0 c-source-file-id !          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" includedir" getenv append ] sliteral
         s"  -O -c " s+ lib-filename 2@ append s" .c -o " append          s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
         lib-filename 2@ append s" .lo" append ( c-addr u )          lib-filename 2@ append s" .lo" append ( c-addr u )
         \    cr 2dup type          \    cr 2dup type
         2dup system drop free throw $? abort" libtool compile failed"          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@ dirname s+ s"  " append
         lib-filename 2@ append s" .lo -o " append          lib-filename 2@ append s" .lo -o " append
         lib-filename 2@ append s" .la" append ( c-addr u )          lib-filename 2@ append s" .la" append ( c-addr u )
Line 643  clear-libs Line 641  clear-libs
   
 : init-libcc ( -- )  : init-libcc ( -- )
     s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!      s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
   [IFDEF] make-path
     make-path to libcc-path      make-path to libcc-path
     libcc-named-dir libcc-path also-path      libcc-named-dir libcc-path also-path
     [ s" libccdir" getenv ] sliteral libcc-path also-path      [ s" libccdir" getenv ] sliteral libcc-path also-path
   [THEN]
 ;  ;
   
 init-libcc  init-libcc

Removed from v.1.43  
changed lines
  Added in v.1.47


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>