bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'SIGAR-152' into sigar-1.6

This commit is contained in:
Doug MacEachern 2009-06-30 16:03:15 -07:00
parent a04e2db66f 4f223cc4d6
commit 3366588f85
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/java/hyperic_jni/jni-build.xml
View File

@ -334,7 +334,7 @@ USA.
<compilerarg value="-g" if="jni.debug"/> <compilerarg value="-g" if="jni.debug"/>
<compilerarg value="-Wall"/> <compilerarg value="-Wall"/>
<compilerarg value="-Werror" if="jni.werror"/> <compilerarg value="-Werror" if="jni.werror"/>
<compilerarg value="-m64" if="jni.usem64"/> <compilerarg value="${jni.gccm}" if="jni.gccm"/>
<defineset> <defineset>
<define name="${jni.define.name}_LINUX"/> <define name="${jni.define.name}_LINUX"/>
<define name="_REENTRANT"/> <define name="_REENTRANT"/>
@ -349,7 +349,7 @@ USA.
<libset if="jni.dmalloc" <libset if="jni.dmalloc"
dir="${jni.dmalloc}/lib" dir="${jni.dmalloc}/lib"
libs="dmallocth"/> libs="dmallocth"/>
<linkerarg value="-m64" if="jni.usem64"/> <linkerarg value="${jni.gccm}" if="jni.gccm"/>
</linker> </linker>
<!-- Darwin --> <!-- Darwin -->

10
bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
View File

@ -68,8 +68,14 @@ public class ArchNameTask extends Task {
getProject().setProperty("jni.arch64", "true"); getProject().setProperty("jni.arch64", "true");
if (ArchLoader.IS_LINUX) { if (ArchLoader.IS_LINUX) {
if (!osArch.equals("ia64")) { if (!osArch.equals("ia64")) {
getProject().setProperty("jni.usem64", "true"); getProject().setProperty("jni.gccm", "-m64");
} }
}
}
else {
if (ArchLoader.IS_LINUX && osArch.equals("s390")) {
//gcc defaults to m64 on s390x platforms
getProject().setProperty("jni.gccm", "-m31");
} }
} }
} }