gnu: classpath-jamvm-wrappers: Fix building on armhf-linux.

* gnu/packages/java.scm (classpath-jamvm-wrappers)[arguments]: Change
the flags used in custom script for armhf-linux.
This commit is contained in:
Efraim Flashner 2018-06-26 12:23:07 +03:00
parent 6e6bd6f929
commit e3ec1258e3
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 2 deletions

View File

@ -531,12 +531,20 @@ the standard javac executable.")))
(for-each (lambda (tool) (for-each (lambda (tool)
(with-output-to-file (string-append bin tool) (with-output-to-file (string-append bin tool)
(lambda _ (lambda _
(format #t "#!~a/bin/sh ,@(if (string-prefix? "armhf" (or (%current-system)
(%current-target-system)))
`((format #t "#!~a/bin/sh
~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \
gnu.classpath.tools.~a.~a $@"
bash jamvm classpath tool
(if (string=? "native2ascii" tool)
"Native2ASCII" "Main")))
`((format #t "#!~a/bin/sh
~a/bin/jamvm -Xnocompact -Xnoinlining -classpath ~a/share/classpath/tools.zip \ ~a/bin/jamvm -Xnocompact -Xnoinlining -classpath ~a/share/classpath/tools.zip \
gnu.classpath.tools.~a.~a $@" gnu.classpath.tools.~a.~a $@"
bash jamvm classpath tool bash jamvm classpath tool
(if (string=? "native2ascii" tool) (if (string=? "native2ascii" tool)
"Native2ASCII" "Main")))) "Native2ASCII" "Main"))))))
(chmod (string-append bin tool) #o755)) (chmod (string-append bin tool) #o755))
(list "javah" (list "javah"
"rmic" "rmic"