diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 7a06656b235cd7a12bc619be3e745eb522b00979..c443f886f7747df0a49c4ac3d2010f883fcd6fa5 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -636,13 +636,31 @@ First consider editing the properties in build.properties
          <arg value="-fPIC" />
          <arg value="-I/System/Library/Frameworks/JavaVM.framework/Headers" />
          <arg value="-Iinclude" />
-         <arg value="-o" />
-         <arg value="${basedir}/dist/cltest" />
          <arg value="src/cpp/cltest.cpp" />
          <arg value="-framework" />
          <arg value="OpenCL" />
+         <arg value="-o" />
+         <arg value="${basedir}/cltest_${x86_or_x86_64}" />
+      </exec>
+   </target>
+
+   <target name="gcc_cltest" if="use.gcc">
+      <mkdir dir="${basedir}/dist"/>
+      <echo message="gcc cltest ${os.arch}" />
+      <exec executable="g++">
+         <arg value="-O3" />
+         <arg value="-g" />
+         <arg value="-fPIC" />
+         <arg value="-I${java.home}/../include" />
+         <arg value="-I${java.home}/../include/linux" />
+         <arg value="-I${amd.app.sdk.dir}/include" />
+         <arg value="src/cpp/cltest.cpp" />
+         <arg value="-L${amd.app.sdk.dir}/lib/${x86_or_x86_64}" />
+         <arg value="-lOpenCL" />
+         <arg value="-o" />
+         <arg value="${basedir}/cltest_${x86_or_x86_64}" />
       </exec>
    </target>
 
-   <target name="cltest" depends="check,msvc_cltest,mac_cltest" />
+   <target name="cltest" depends="check,msvc_cltest,mac_cltest,gcc_cltest" />
 </project>