From f0ea947844214dda79f50737b93f10e976ebafef Mon Sep 17 00:00:00 2001
From: Peter Nordquist <peter.nordquist@pnnl.gov>
Date: Wed, 24 Sep 2014 13:01:43 -0700
Subject: [PATCH] Support Jenkins build override for bitness since we don't
have a 32-bit machine
---
com.amd.aparapi.jni/build.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 666b2f1d..927f2f08 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -315,17 +315,11 @@ First consider editing the properties in build.properties
</condition>
<condition property="optional.amd64.subdir" value="" else="amd64\">
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
+ <equals arg1="${x86_or_x86_64}" arg2="x86"/>
</condition>
<condition property="optional.x64.subdir" value="" else="x64\">
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
+ <equals arg1="${x86_or_x86_64}" arg2="x86"/>
</condition>
--
GitLab