Merge branch 'SIGAR-184' into sigar-1.6
This commit is contained in:
		
						commit
						6b9ac77afa
					
				@ -275,6 +275,7 @@ USA.
 | 
			
		||||
      <!-- HPUX -->
 | 
			
		||||
      <compiler name="hp"  if="hpux">
 | 
			
		||||
        <compilerarg value="+Z"/>
 | 
			
		||||
        <compilerarg value="+DD64" if="jni.arch64"/>
 | 
			
		||||
 | 
			
		||||
        <defineset>
 | 
			
		||||
          <define name="${jni.define.name}_HPUX"/>
 | 
			
		||||
 | 
			
		||||
@ -67,6 +67,9 @@ public class ArchName {
 | 
			
		||||
            }
 | 
			
		||||
            else {
 | 
			
		||||
                arch = "pa";
 | 
			
		||||
                if (is64()) {
 | 
			
		||||
                    arch += "64";
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            if (version.indexOf("11") > -1) {
 | 
			
		||||
                return arch + "-hpux-11";
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user