diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-05-22 10:04:20 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-05-22 10:04:20 +0200 |
| commit | 255ba80655ad3f3037620c2194da08e69e510543 (patch) | |
| tree | e6b570ca549c6e043b7fffe8d4ab448d380f6156 /set_soenv.in | |
| parent | 3c3aa80261c56091d17973df8f1ca8d819987c09 (diff) | |
Use the same OUTPATH on all NetBSD architectures
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/set_soenv.in b/set_soenv.in index b86b4454d36b..fc81fa6bbcab 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -235,7 +235,6 @@ elsif ( $platform =~ m/netbsd/ ) $outfile = "NetBSDX86Env.Set.sh"; $CPU = "I"; $CPUNAME = "INTEL"; - $OUTPATH = "unxbsdi"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; @@ -245,7 +244,6 @@ elsif ( $platform =~ m/netbsd/ ) $outfile = "NetBSDX86-64Env.Set.sh"; $CPU = "X"; $CPUNAME = "X86_64"; - $OUTPATH = "unxbsdx"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; @@ -255,7 +253,6 @@ elsif ( $platform =~ m/netbsd/ ) $outfile = "NetBSDSparcEnv.Set.sh"; $CPU = "S"; $CPUNAME = "SPARC"; - $OUTPATH = "unxbsds"; $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; @@ -265,7 +262,6 @@ elsif ( $platform =~ m/netbsd/ ) $outfile = "NetBSDPPCEnv.Set.sh"; $CPU = "P"; $CPUNAME = "POWERPC"; - $OUTPATH = "unxbsdppc"; $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"; @@ -284,6 +280,7 @@ elsif ( $platform =~ m/netbsd/ ) $INPATH = $OUTPATH.$PROEXT; $OS = "NETBSD"; $PATH_SEPERATOR = $ps; + $OUTPATH = "unxnbsd"; } elsif ( $platform =~ m/kfreebsd/ ) { |