From 77439ac992bd9db2845ab3a05b32d2b3ea5dc26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 2 Oct 2009 12:46:13 +0200 Subject: Give the qws ppc mkspec usable default values and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom --- configure | 3 --- mkspecs/qws/linux-ppc-g++/qmake.conf | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index c521bad..8ef8ad0 100755 --- a/configure +++ b/configure @@ -2313,9 +2313,6 @@ if [ "$CFG_EMBEDDED" != "no" ]; then *86_64) PLATFORM=qws/linux-x86_64-g++ ;; - *ppc) - PLATFORM=qws/linux-ppc-g++ - ;; *) PLATFORM=qws/linux-generic-g++ ;; diff --git a/mkspecs/qws/linux-ppc-g++/qmake.conf b/mkspecs/qws/linux-ppc-g++/qmake.conf index a026e88..e1926b4 100644 --- a/mkspecs/qws/linux-ppc-g++/qmake.conf +++ b/mkspecs/qws/linux-ppc-g++/qmake.conf @@ -6,4 +6,15 @@ include(../../common/g++.conf) include(../../common/linux.conf) include(../../common/qws.conf) +# modifications to g++.conf +QMAKE_CC = powerpc-linux-gcc +QMAKE_CXX = powerpc-linux-g++ +QMAKE_LINK = powerpc-linux-g++ +QMAKE_LINK_SHLIB = powerpc-linux-g++ + +# modifications to linux.conf +QMAKE_AR = powerpc-linux-ar cqs +QMAKE_OBJCOPY = powerpc-linux-objcopy +QMAKE_STRIP = powerpc-linux-strip + load(qt_config) -- cgit v0.12