02/09: gnu: ant-bootstrap: Fix building on armhf-linux.

[Efraim Flashner]

efraim pushed a commit to branch staging
in repository guix.

commit a495998b79f34ebad89942f8827fc18283c0723c
Author: Efraim Flashner <address@hidden>
Date:   Mon Jun 25 11:50:11 2018 +0300

    gnu: ant-bootstrap: Fix building on armhf-linux.
    
    * gnu/packages/java.scm (ant-bootstrap)[arguments]: On armhf-linux add
    different flags to the 'bootstrap.sh' file.
---
 gnu/packages/java.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 54bfd8c..e7e34a2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -253,7 +253,10 @@ JNI.")
              ;; Without these JamVM options the build may freeze.
              (substitute* "bootstrap.sh"
                (("^\"\\$\\{JAVACMD\\}\" " m)
-                (string-append m "-Xnocompact -Xnoinlining ")))
+                ,@(if (string-prefix? "armhf" (or (%current-system)
+                                                  (%current-target-system)))
+                      `((string-append m "-Xnocompact "))
+                      `((string-append m "-Xnocompact -Xnoinlining ")))))
 
              ;; Disable tests because we are bootstrapping and thus don't have
              ;; any of the dependencies required to build and run the tests.