summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-23 02:20:02 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-23 17:33:48 +0300
commit6c28e9e1433f9d7e3f7efe31627198bfc0191ee1 (patch)
tree006c0a4421641d52590a31210bcc865850114df2
parent62a339916b7f7fc1d979cd7d949801a4b6f3d8e1 (diff)
Set SOLARLIB also for MinGW (cross-)compilation
Set it as on Cygwin, and with the -L flags in the same order as for Linux &co for consistency.
-rwxr-xr-xset_soenv.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/set_soenv.in b/set_soenv.in
index a01a8d01a7e9..0744891eed3d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1303,10 +1303,10 @@ elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
$L.$JRETOOLKITDIR.
$L.$JRETHREADDIR;
}
-elsif ($platform =~ m/cygwin/)
-{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
- $L.$par_dir.$LIB.
- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
+elsif ($platform =~ m/cygwin|mingw32/)
+{ $SOLARLIB = $L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+ $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
}
elsif ($platform =~ m/darwin/)
{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.