summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-04-09 20:45:10 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-11 18:49:59 (GMT)
commitc785dfe96e516d5964f8d4c4b1469fda7a9a6bb9 (patch)
treedc7f8f7703602055b956045dd6555f2cb085a5ec
parenta9dc50330acee2ac4fe4e09677ec71885e7baf08 (diff)
downloadQt-c785dfe96e516d5964f8d4c4b1469fda7a9a6bb9.zip
Qt-c785dfe96e516d5964f8d4c4b1469fda7a9a6bb9.tar.gz
Qt-c785dfe96e516d5964f8d4c4b1469fda7a9a6bb9.tar.bz2
Don't use UNAME_MACHINE on Linux
We don't need it. Let linux-g++ be the default on all Linux builds, period. Task-number: QTBUG-30590 Change-Id: I26c73bf4f054684763b64ef5651b3488363ea7a1 (cherry-picked from qtbase commit 2c5188f0777f4a0723b4cb9fd36354a357145519) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure9
1 files changed, 1 insertions, 8 deletions
diff --git a/configure b/configure
index bb04cf7..460b446 100755
--- a/configure
+++ b/configure
@@ -2938,14 +2938,7 @@ if [ -z "$PLATFORM" ]; then
"
;;
Linux:*)
- case "$UNAME_MACHINE" in
- x86_64|s390x|ppc64)
- PLATFORM=linux-g++-64
- ;;
- *)
- PLATFORM=linux-g++
- ;;
- esac
+ PLATFORM=linux-g++
PLATFORM_NOTES="
- Also available for Linux: linux-kcc linux-icc linux-cxx
"