aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-05-08 16:00:33 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-05-09 06:15:51 +0000
commit650a062e3f2efb7871caca2b2f81997359d4033d (patch)
treedd46aa8c026cb4af75c8ad3140e8d29b096d5288
parent9be4b8d59328fbfc1699666ecd4d33adbab3f72c (diff)
nativesdk-qtbase: add quotes to CC and CXX in environment file
CC and CXX include sysroot as argument to compiler and therefore includes spaces, which need to be quoted to work e.g., with dash. Task-number: QTBUG-68163 Change-Id: Ib8cbc89eb6efd09b9482116d63f76b61188504b1 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 27514127..7045b8b0 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -185,9 +185,9 @@ fakeroot do_generate_qt_environment_file() {
echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
- echo 'export OE_QMAKE_CC=$CC' >> $script
- echo 'export OE_QMAKE_CXX=$CXX' >> $script
- echo 'export OE_QMAKE_LINK=$CXX' >> $script
+ echo 'export OE_QMAKE_CC="$CC"' >> $script
+ echo 'export OE_QMAKE_CXX="$CXX"' >> $script
+ echo 'export OE_QMAKE_LINK="$CXX"' >> $script
echo 'export OE_QMAKE_AR=$AR' >> $script
echo 'export OE_QMAKE_STRIP=$STRIP' >> $script
echo 'export QT_CONF_PATH=${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script