Changeset 11681


Ignore:
Timestamp:
02/22/09 19:42:19 (12 years ago)
Author:
ehuelsmann
Message:

*nix compilation fixes for Lisp based build.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build-abcl.lisp

    r11680 r11681  
    335335                         '(("\\" . "/")))))
    336336         (cmdline (format nil
    337                           "~A -cp build\\classes -Dabcl.home=\"~A\" ~
     337                          "~A -cp build/classes -Dabcl.home=\"~A\" ~
    338338org.armedbear.lisp.Main --noinit ~
    339339--eval \"(compile-system :zip ~A :quit t :output-path \\\"~A\\\")\"~%"
     
    391391             (if (eq *platform* :linux)
    392392                 ;; On Linux, set java.library.path for libabcl.so.
    393                  (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -Xrs -Djava.library.path=~A -cp ~A:~A org.armedbear.lisp.Main \"$@\"~%"
     393                 (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -Xrs -Djava.library.path=~A -cp ~A org.armedbear.lisp.Main \"$@\"~%"
    394394                         (safe-namestring *java*)
    395                          (safe-namestring *abcl-dir*)
    396                          (safe-namestring *source-root*)
    397                          (safe-namestring (merge-pathnames "abcl.jar" *tree-root*)))
     395                         (safe-namestring (merge-pathnames "org/armedbear/lisp/" *build-root*))
     396                         (safe-namestring (merge-pathnames "abcl.jar" *dist-root*)))
    398397                 ;; Not Linux.
    399                  (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -cp ~A:~A org.armedbear.lisp.Main \"$@\"~%"
     398                 (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -cp ~A org.armedbear.lisp.Main \"$@\"~%"
    400399                         (safe-namestring *java*)
    401                          (safe-namestring *source-root*)
    402                          (safe-namestring (merge-pathnames "abcl.jar" *tree-root*)))))
     400                         (safe-namestring (merge-pathnames "abcl.jar" *dist-root*)))))
    403401           (run-shell-command (format nil "chmod +x ~A" (safe-namestring pathname))
    404402                              :directory *tree-root*)))))
Note: See TracChangeset for help on using the changeset viewer.