From eeebb94da8030173fc5097bb017976713d30b894 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sun, 23 Jan 2022 13:51:39 -0500
Subject: [PATCH] set ld and windres for rpi

---
 build/build.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index a2060359b..8a75c939e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -958,8 +958,16 @@
 
     <property name="launch4j.dir"
               value="linux/work/modes/java/application/launch4j" />
-    <!-- this might be already overwritten by check-linux-arm32 -->
+
+    <!-- for ARM, we need different binaries for ld and windres -->
     <property name="launch4j.variant" value="linux" />
+    <condition property="launch4j.variant"
+               value="linux-armv6hf" else="linux">
+      <or>
+        <equals arg1="${os.arch}" arg2="arm" />
+        <equals arg1="${os.arch}" arg2="aarch64" />
+      </or>
+    </condition>
 
     <!-- rename the version we need -->
     <move file="${launch4j.dir}/bin/windres-${launch4j.variant}"