diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 15:08:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 20:29:38 +0100 |
| commit | 4ab1dd54b010d6787ace7376af1280eb9431700a (patch) | |
| tree | b12f0aa2c439dfa117f18c08a9a619a74d0d10af /set_soenv.in | |
| parent | 0fd69181443bdfaff2563bea04e02c252fafef07 (diff) | |
AIX tweaks
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/set_soenv.in b/set_soenv.in index b2d6b093c0ab..492ead61d7a3 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -778,16 +778,11 @@ elsif ( $platform =~ m/darwin/ ) } elsif ( $platform =~ m/aix/ ) { - if( $platform !~ m/^powerpc/ ) - { - print "\nAIX has only been ported and tested on powerpc\n"; - AddWarning( "set_soenv", "Platform $platform has not been tested"); - } print "Setting AIX PPC specific values... "; $outfile = "aixPPCEnv.Set"; $CPU = "P"; $CPUNAME = "POWERPC"; - $OUTPATH = "unxlngppc"; + $OUTPATH = "unxaigppc"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; @@ -1380,7 +1375,7 @@ $SOLARINC = $I.$cur_dir. $I.'$SOLARENV'.$INC. $I.'$SRC_ROOT'.$ds."res"; -if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/) +if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|aix/) { $SOLARINC .= $STLPORT_stlport; if ($platform =~ m/linux|freebsd|netbsd/) @@ -1425,13 +1420,16 @@ if ($platform =~ m/linux/) elsif ($platform =~ m/netbsd/) { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; } + elsif ( $platform =~ m/aix/ ) + { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."aix"; + } #java threads include path $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include"; } #The tail, if needed - if ($platform =~ m/linux|freebsd|netbsd/) + if ($platform =~ m/linux|freebsd|netbsd|aix/) { $SOLARINC .= $I.$XINC; } elsif ($platform =~ m/osf1/) |