diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-15 11:02:06 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-18 09:44:52 +0200 |
| commit | ac8056ef0e5b45e80bf430d27369efbe921421a1 (patch) | |
| tree | 58cda247d009ac0303f16a771f60f671d9fda437 /classes | |
| parent | 6fcc09a1e81f4a672a832dcfeb39c300c46d5e9d (diff) | |
Add QMAKE_OBJCOPY and QMAKE_NM to mkspec
Needed to use the correct cross-compiler tools for objcopy and nm.
Fixes: QTBUG-90256
Pick-to: 6.0
Change-Id: I38048033b17d388b86612bc7205c4e22d948be29
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_sdk_qt6_base.bbclass | 6 | ||||
| -rw-r--r-- | classes/qt6-qmake.bbclass | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index eb8ade4..f7ea63c 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -45,16 +45,20 @@ create_qt6_sdk_files () { echo 'export OE_QMAKE_LINK="$CXX"' >> $script echo 'export OE_QMAKE_AR="$AR"' >> $script echo 'export OE_QMAKE_STRIP="$STRIP"' >> $script + echo 'export OE_QMAKE_OBJCOPY="$OBJCOPY"' >> $script + echo 'export OE_QMAKE_NM="$NM"' >> $script mkspec=${SDK_OUTPUT}${SDKTARGETSYSROOT}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf echo "count(QMAKE_AR, 1): QMAKE_AR = ${AR} cqs" >> $mkspec + echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${STRIP}" >> $mkspec + echo "isEmpty(QMAKE_OBJCOPY): QMAKE_OBJCOPY = ${OBJCOPY}" >> $mkspec + echo "count(QMAKE_NM, 1): QMAKE_NM = ${NM} -P" >> $mkspec echo "isEmpty(QMAKE_CC): QMAKE_CC = ${CC}" >> $mkspec echo "isEmpty(QMAKE_CFLAGS): QMAKE_CFLAGS = ${CFLAGS}" >> $mkspec echo "isEmpty(QMAKE_CXX): QMAKE_CXX = ${CXX}" >> $mkspec echo "isEmpty(QMAKE_CXXFLAGS): QMAKE_CXXFLAGS = ${CXXFLAGS}" >> $mkspec echo "isEmpty(QMAKE_LINK): QMAKE_LINK = ${CXX}" >> $mkspec echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${LDFLAGS}" >> $mkspec - echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${STRIP}" >> $mkspec sed -i $mkspec \ -e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \ -e 's:${TARGET_PREFIX}:$$[QT_HOST_BINS]/${TARGET_SYS}/${TARGET_PREFIX}:' diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass index 6952850..ba65fdc 100644 --- a/classes/qt6-qmake.bbclass +++ b/classes/qt6-qmake.bbclass @@ -71,6 +71,8 @@ export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" +export OE_QMAKE_OBJCOPY = "${OBJCOPY}" +export OE_QMAKE_NM = "${NM}" # qmake reads if from shell environment export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" |