modify build xml file and ArchName.java hyperic#66

lizhanyin · Aug 28, 2024 · 9a3d262 · 9a3d262
1 parent 711e043
commit 9a3d262
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/bindings/java/hyperic_jni/jni-build.xml b/bindings/java/hyperic_jni/jni-build.xml
@@ -270,8 +270,9 @@
 	relentless="false">
 
       <!-- HPUX -->
-      <compiler name="hp"  if="hpux">
+      <compiler name="aCC"  if="hpux">
         <compilerarg value="+Z"/>
+        <compilerarg value="-Ae"/>
         <compilerarg value="+DD64" if="jni.arch64"/>
 
         <defineset>
@@ -281,7 +282,8 @@
         </defineset>
       </compiler>
 
-      <linker name="hp" if="hpux">
+      <linker name="aCC" if="hpux">
+      	<linkerarg value="+DD64" if="jni.arch64"/>
         <libset if="jni.libset.libs"
                 dir="${jni.libset.dir}"
                 libs="${jni.libset.libs}"/>
@@ -437,7 +439,7 @@
       </linker>
 
       <!-- AIX -->
-      <compiler name="xlc_r" if="aix">
+      <compiler name="xlC" if="aix">
         <compilerarg value="-q64" if="jni.arch64"/>
         <defineset>
           <define name="${jni.define.name}_AIX"/>
@@ -447,7 +449,7 @@
         </defineset>
       </compiler>
 
-      <linker name="xlc_r" if="aix">
+      <linker name="xlC" if="aix">
         <linkerarg value="-b64" if="jni.arch64"/>
         <libset if="jni.libset.libs"
                 dir="${jni.libset.dir}"
@@ -510,4 +512,3 @@
   <target name="jni-clean">
     <delete dir="${jni.objdir}"/>
   </target>
-
diff --git a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchName.java b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchName.java
@@ -62,7 +62,10 @@ else if (name.equals("SunOS")) {
         }
         else if (name.equals("HP-UX")) {
             if (arch.startsWith("IA64")) {
-                arch = "ia64";
+                arch = "ia";
+                if (is64()) {
+                    arch += "64";
+                }
             }
             else {
                 arch = "pa";