summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-09-09 22:00:10 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-09-09 22:00:10 (GMT)
commit03c56248554b731356d283e467e1d31c54e78653 (patch)
tree5cfc5f5009f6534951f85257dddf1be1260b516f /configure
parentdd387a0125b577fafc1a3363a4b8cd995053b7db (diff)
parent524379030503600bbca1a8e2b5889b91b0798203 (diff)
downloadQt-03c56248554b731356d283e467e1d31c54e78653.zip
Qt-03c56248554b731356d283e467e1d31c54e78653.tar.gz
Qt-03c56248554b731356d283e467e1d31c54e78653.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 1 insertions, 4 deletions
diff --git a/configure b/configure
index b796de9..1ad0181 100755
--- a/configure
+++ b/configure
@@ -1434,9 +1434,6 @@ while [ "$#" -gt 0 ]; do
solaris-64)
PLATFORM=solaris-cc-64
;;
- solaris-64)
- PLATFORM=solaris-cc-64
- ;;
openunix-cc)
PLATFORM=unixware-cc
;;
@@ -2870,7 +2867,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