From 3171ff971c1c8d230e4a22091c9322e87b8b6c9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Sep 2024 15:05:18 +0300 Subject: gnu: classpath-jamvm-wrappers: Adjust wrapper for armhf-linux. This fixes building icedtea-2 on armhf-linux. * gnu/packages/java-bootstrap.scm (classpath-jamvm-wrappers)[arguments]: Adjust the flags passed to jamvm in the wrapper script when building for armhf-linux. Change-Id: I68a47b0eec761b1be9126ac814693fba7fa7e56e --- gnu/packages/java-bootstrap.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm index 481d8cd0756..645cbfa4421 100644 --- a/gnu/packages/java-bootstrap.scm +++ b/gnu/packages/java-bootstrap.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2022 Marius Bakke -;;; Copyright © 2018, 2020 Efraim Flashner +;;; Copyright © 2018, 2020, 2024 Efraim Flashner ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2019 Andrius Štikonas @@ -492,10 +492,9 @@ the standard javac executable."))) (for-each (lambda (tool) (with-output-to-file (string-append bin tool) (lambda _ - #$@(if (string-prefix? "armhf" (or (%current-system) - (%current-target-system))) + #$@(if (target-arm32?) `((format #t "#!~a/bin/sh -~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \ +~a/bin/jamvm -classpath ~a/share/classpath/tools.zip \ gnu.classpath.tools.~a.~a $@" bash jamvm classpath tool (if (string=? "native2ascii" tool) -- cgit v1.2.3