summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@nokia.com>2010-08-20 15:52:36 (GMT)
committerPierre Rossi <pierre.rossi@nokia.com>2010-08-31 14:51:25 (GMT)
commit19198b08a1d5b6f4e6875d93e2647b38e8f11184 (patch)
treeffa9975424aa9f7e198346dce9792093b22dc495 /configure
parent0b438841e98add45fbddce51e210aea0c97a1f91 (diff)
downloadQt-19198b08a1d5b6f4e6875d93e2647b38e8f11184.zip
Qt-19198b08a1d5b6f4e6875d93e2647b38e8f11184.tar.gz
Qt-19198b08a1d5b6f4e6875d93e2647b38e8f11184.tar.bz2
Some small Solaris fixes.
Sets the arch properly for solaris-cc-64-stlport on x86_64. This patch also removes three redundant lines in configure and disables qtconcurrent examples when it's not available. Reviewed-by: Thiago
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 1 insertions, 4 deletions
diff --git a/configure b/configure
index eaae2d1..f3420c8 100755
--- a/configure
+++ b/configure
@@ -1388,9 +1388,6 @@ while [ "$#" -gt 0 ]; do
solaris-64)
PLATFORM=solaris-cc-64
;;
- solaris-64)
- PLATFORM=solaris-cc-64
- ;;
openunix-cc)
PLATFORM=unixware-cc
;;
@@ -2687,7 +2684,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
;;
i86pc)
case "$PLATFORM" in
- *-64)
+ *-64*)
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit AMD 80x86 (x86_64)"
fi