diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-03-25 19:28:19 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-03-25 21:41:26 +0200 |
| commit | aa432388da01ebf3f7262e958714fa8295a9df78 (patch) | |
| tree | f2a2b219506b29e1ba13759cf831d36f0f2df78d /gnu/packages/java.scm | |
| parent | 063629aa3ef21e216357430ab1601fc58d0f4daf (diff) | |
| download | guix-patches-aa432388da01ebf3f7262e958714fa8295a9df78.tar guix-patches-aa432388da01ebf3f7262e958714fa8295a9df78.tar.gz | |
gnu: ant-bootstrap: Build with JamVM 1.5.1.
* gnu/packages/java.scm (ant-bootstrap)[native-inputs]: Replace sablevm with
jamvm-1-bootstrap.
[arguments]: Adjust accordingly.
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a8ba91127f..c039791c87 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -312,15 +312,16 @@ JNI.") (delete 'configure) (replace 'build (lambda* (#:key inputs #:allow-other-keys) - (setenv "JAVA_HOME" - (string-append (assoc-ref inputs "sablevm") - "/lib/sablevm")) + (setenv "JAVA_HOME" (assoc-ref inputs "jamvm")) (setenv "JAVACMD" - (string-append (assoc-ref inputs "sablevm") - "/bin/java-sablevm")) + (string-append (assoc-ref inputs "jamvm") + "/bin/jamvm")) (setenv "JAVAC" - (string-append (assoc-ref inputs "sablevm") - "/bin/javac-sablevm")) + (string-append (assoc-ref inputs "jikes") + "/bin/jikes")) + (setenv "CLASSPATH" + (string-append (assoc-ref inputs "jamvm") + "/lib/rt.jar")) ;; Use jikes instead of javac for <javac ...> tags in build.xml (setenv "ANT_OPTS" "-Dbuild.compiler=jikes") @@ -339,7 +340,7 @@ JNI.") (delete 'install)))) (native-inputs `(("jikes" ,jikes) - ("sablevm" ,sablevm))) + ("jamvm" ,jamvm-1-bootstrap))) (home-page "http://ant.apache.org") (synopsis "Build tool for Java") (description |