diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-18 14:26:02 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-20 15:17:55 +0200 |
| commit | 21c1abd75b44020cccbd8423d34e2871e1c333c9 (patch) | |
| tree | ab20813ff9dd804987ac916549620f7cad27c3f4 /classes | |
| parent | 82f713bc27cf7811cc502706d2587a921dd5bfa7 (diff) | |
Add QMAKE_AR_LTCG
Amend 438c538fd285b33406633574f65dd5045baf8134 with QMAKE_AR_LTCG which
is needed when using LTCG configure option. Cleanup unused variables:
QMAKE_NM has never been used and QMAKE_CFLAGS_ISYSTEM is no longer used.
Pick-to: 6.0
Change-Id: Icdb9ba48f867ff30066d8fda0c223cc3b2be2c2d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_sdk_qt6_base.bbclass | 4 | ||||
| -rw-r--r-- | classes/qt6-qmake.bbclass | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index f7ea63c..2e6a3fa 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -46,13 +46,13 @@ create_qt6_sdk_files () { 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 + echo 'export OE_QMAKE_AR_LTCG="${HOST_PREFIX}gcc-ar"' >> $script mkspec=${SDK_OUTPUT}${SDKTARGETSYSROOT}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf echo "count(QMAKE_AR, 1): QMAKE_AR = ${AR} cqs" >> $mkspec + echo "count(QMAKE_AR_LTCG, 1): QMAKE_AR_LTCG = ${HOST_PREFIX}gcc-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 diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass index ba65fdc..5c38462 100644 --- a/classes/qt6-qmake.bbclass +++ b/classes/qt6-qmake.bbclass @@ -72,7 +72,7 @@ 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}" +export OE_QMAKE_AR_LTCG = "${HOST_PREFIX}gcc-ar" # qmake reads if from shell environment export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" |