From 42c422edba7205c5e9b00cbd7228f2a84c51cc43 Mon Sep 17 00:00:00 2001
From: Peter Nordquist <peter.nordquist@pnnl.gov>
Date: Wed, 24 Sep 2014 14:28:18 -0700
Subject: [PATCH] Add gcc configuration to specify -m value for Jenkins builds
---
com.amd.aparapi.jni/build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 927f2f08..0ea10815 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -321,7 +321,10 @@ First consider editing the properties in build.properties
<condition property="optional.x64.subdir" value="" else="x64\">
<equals arg1="${x86_or_x86_64}" arg2="x86"/>
</condition>
-
+
+ <condition property="gcc.m.value" value="32" else="64">
+ <equals arg1="${x86_or_x86_64}" arg2="x86"/>
+ </condition>
<available file="${msvc.dir}\vc\bin\${optional.amd64.subdir}cl.exe" type="file" property="cl.exists" />
@@ -447,6 +450,7 @@ First consider editing the properties in build.properties
<mkdir dir="${basedir}/dist"/>
<echo message="linuxcc ${os.arch}" />
<exec executable="g++" failonerror="true">
+ <arg value="-m${gcc.m.value}" />
<arg value="-O3" />
<arg value="-g" />
<arg value="-fPIC" />
--
GitLab