diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
| commit | d0c45d2d822fdf31b8a8edc73fe7be12a0676705 (patch) | |
| tree | 04ae8108a67013fce99273db4582c29e7845f0a7 /gnu/packages/java.scm | |
| parent | 0b70f7d557181febd80b16c8e3a03887df3871af (diff) | |
| parent | ac1560f18c25e4312c1f32c001405c176daa1764 (diff) | |
| download | guix-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar guix-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
(incorporated libtiff graft)
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b422a1effe..9a129b8d91 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -640,11 +640,16 @@ the standard javac executable. The tool runs on JamVM instead of SableVM."))) (base32 "1v2rww76ww322mpg3s12a1kkc6gkp31bm9gcxs532h0wq285fiw4")))) (arguments - `(#:configure-flags + `(#:make-flags + ;; Ensure that the initial heap size is smaller than the maximum + ;; size. By default only Xmx is set, which can lead to invalid + ;; memory settings on some machines with a lot of memory. + '("JAVAC_MEM_OPT=-J-Xms512M -J-Xmx768M") + #:configure-flags (list (string-append "--with-ecj-jar=" (assoc-ref %build-inputs "ecj-bootstrap") "/share/java/ecj-bootstrap.jar") - (string-append "JAVAC=" + (string-append "--with-javac=" (assoc-ref %build-inputs "ecj-javac-wrapper") "/bin/javac") (string-append "JAVA=" |