From 92c34de4bb11223c059466d3d0690eb763a56102 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 Jan 2019 14:51:33 +0200 Subject: 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. Signed-off-by: Samuli Piippo --- classes/qmake5_base.bbclass | 2 -- 1 file changed, 2 deletions(-) (limited to 'classes') 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}" -- cgit v1.2.3-54-g00ecf