aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorAlex Vong <alexvong1995@gmail.com>2018-05-24 00:32:51 +0800
committerDanny Milosavljevic <dannym@scratchpost.org>2018-10-18 14:59:55 +0200
commit33428d12672fefde745b313ce1f0c02ae9870e39 (patch)
tree9adfa3df3842fdb2048fc0b6265edba7ee7496a7 /gnu
parent6662d65f96b948271eeaa0ba5c93d0e61663e7d3 (diff)
downloadgnu-guix-33428d12672fefde745b313ce1f0c02ae9870e39.tar
gnu-guix-33428d12672fefde745b313ce1f0c02ae9870e39.tar.gz
gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary.
* gnu/packages/java.scm (javacc)[source](snippet): Delete bootstrap binary. [arguments]: Set 'bootstrap-jar' path. [native-inputs]: Add 'javacc-4'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/java.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d89ba6a005..f6d72edeea 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2010,12 +2010,20 @@ debugging, etc.")
"111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
(modules '((guix build utils)))
;; delete bundled jars
- (snippet '(begin (delete-file-recursively "lib") #t))))
- (arguments
- `(#:test-target "test"
+ (snippet '(begin (for-each delete-file-recursively
+ '("bootstrap" "lib"))
+ #t))))
+ (arguments
+ `(#:make-flags ; bootstrap from javacc-4
+ (list (string-append "-Dbootstrap-jar="
+ (assoc-ref %build-inputs "javacc")
+ "/share/java/javacc.jar"))
+ #:test-target "test"
#:phases
(modify-phases %standard-phases
- (replace 'install (install-jars "target")))))))
+ (replace 'install (install-jars "target")))))
+ (native-inputs
+ `(("javacc" ,javacc-4)))))
;; This is the last 3.x release of ECJ
(define-public java-ecj-3