diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-08 14:51:33 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-10 06:05:48 +0000 |
| commit | 9c6ce8100223675bf970b647f96e89e5ecceaaa6 (patch) | |
| tree | d441343ab6d181f805dd0c4d69a505be4e00ea85 /classes | |
| parent | f7d2387ba0d80c26ae4febec5c37b05e8df7a32b (diff) | |
qt5: cleanup mkspecs
QMAKE_COMPILER is not meant to be the actual compiler, but a compiler
type (gcc, clang, mingw). For both mkspecs it's already set in the
common includes. Remove wayland and debug settings from the clang
mkspec as they are already removed from the gcc mkspec.
Change-Id: I59ebc64007ebb828d70cf769121bc2d64886d1c0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index b3a4826a..48da05e8 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -20,7 +20,6 @@ SSTATE_SCAN_FILES += "*.pri *.prl *.prf" # then OE_QMAKE_CFLAGS are exported and used correctly, but then whole CFLAGS is overwritten from env (and -fPIC lost and build fails) EXTRA_OEMAKE = " \ MAKEFLAGS='${PARALLEL_MAKE}' \ - OE_QMAKE_COMPILER='${OE_QMAKE_COMPILER}' \ OE_QMAKE_CC='${OE_QMAKE_CC}' \ OE_QMAKE_CXX='${OE_QMAKE_CXX}' \ OE_QMAKE_CFLAGS='${OE_QMAKE_CFLAGS}' \ @@ -33,7 +32,6 @@ EXTRA_OEMAKE = " \ " OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake" -export OE_QMAKE_COMPILER = "${CC}" export OE_QMAKE_CC = "${CC}" export OE_QMAKE_CFLAGS = "${CFLAGS}" export OE_QMAKE_CXX = "${CXX}" |