diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-03-25 19:34:13 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-03-25 21:41:27 +0200 |
| commit | 6c775dc644958c6844048b02ae7f37890b8979c5 (patch) | |
| tree | 945646b5692a151c48c7f1ec3a5371dcdf59a828 /gnu | |
| parent | ff4d9fdf8cca08e719a6330b0b25762bc8ccef6f (diff) | |
| download | patches-6c775dc644958c6844048b02ae7f37890b8979c5.tar patches-6c775dc644958c6844048b02ae7f37890b8979c5.tar.gz | |
gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes.
* gnu/packages/java.scm (ecj-bootstrap)[native-inputs]: Replace "sablevm" with
"jikes" and "jamvm-1-bootstrap".
[arguments]: Adjust accordingly.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/java.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e2b2405efa..ad79e5c67a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -379,9 +379,12 @@ build process and its dependencies, whereas Make uses Makefile format.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CLASSPATH" (string-join - (find-files (string-append (assoc-ref inputs "ant-bootstrap") - "/lib") - "\\.jar$") + (cons (string-append (assoc-ref inputs "jamvm") + "/lib/rt.jar") + (find-files (string-append + (assoc-ref inputs "ant-bootstrap") + "/lib") + "\\.jar$")) ":")) #t)) (replace 'build @@ -396,7 +399,7 @@ build process and its dependencies, whereas Make uses Makefile format.") Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"))) ;; Compile it all! - (and (zero? (apply system* "javac-sablevm" + (and (zero? (apply system* "jikes" (find-files "." "\\.java$"))) (zero? (system* "fastjar" "cvfm" "ecj-bootstrap.jar" "manifest" "."))))) @@ -410,7 +413,8 @@ Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n"))) (native-inputs `(("ant-bootstrap" ,ant-bootstrap) ("unzip" ,unzip) - ("sablevm" ,sablevm) + ("jikes" ,jikes) + ("jamvm" ,jamvm-1-bootstrap) ("fastjar" ,fastjar))) (home-page "https://eclipse.org") (synopsis "Eclipse Java development tools core batch compiler") |