diff mbox

[15/15] setup.sh: QMAKESPEC can be specified by a short name

Message ID c429e0d2d4bf3de11a33425ac6ad21cddabdbd08.1404891982.git.Svend.Vedstesen@prevas.dk
State Accepted
Delegated to: Christian Sørensen
Headers show

Commit Message

Svend Aage Vedstesen July 9, 2014, 8:42 a.m. UTC 
Do not make QMAKESPEC OS dependent
---
 recipes/sdk/qt5-sdk-script/setup.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/recipes/sdk/qt5-sdk-script/setup.sh b/recipes/sdk/qt5-sdk-script/setup.sh
index 6539e0f..d873b3e 100755
--- a/recipes/sdk/qt5-sdk-script/setup.sh
+++ b/recipes/sdk/qt5-sdk-script/setup.sh
@@ -67,13 +67,6 @@  export OE_QMAKE_CXX="${CXX}"
 export OE_QMAKE_AR="${AR}"
 export OE_QMAKE_STRIP="${STRIP}"
 
-# Must we differentiate here?
-if [[ $CURRENT_OS == Linux* ]] ; then
-  export QMAKESPEC="${SYS}usr/share/qt5/mkspecs/linux-oe-g++"
-else
-  export QMAKESPEC="linux-oe-g++"
-fi
-
 QT_CONF_FILE=${TOOL}/qt.conf
 touch ${QT_CONF_FILE} || exit 1
 
@@ -96,3 +89,5 @@  echo "TargetSpec = ${SYS_REL_TOOL}/usr/share/qt5/mkspecs/linux-oe-g++" >> ${QT_C
 
 # Set the paths to the config file
 export QT_CONF_PATH="${QT_CONF_FILE}"
+# And Specs for target
+export QMAKESPEC="linux-oe-g++"