From 7830cdd8337e3ee9bade2e2c945ce3a2a068e442 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 6 Dec 2017 11:02:07 +0100 Subject: configure: during early setup, skip all of default_pre.prf ... instead of only toolchain.prf. the license check could go haywire, and everything else that file does is meaningless in configure context anyway. Task-number: QTBUG-63452 Change-Id: I5e31c87fe717fda40978c0317556070637e537e2 Reviewed-by: Jake Petroules --- mkspecs/features/default_pre.prf | 3 +++ mkspecs/features/toolchain.prf | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 2d52525190..07a9b1c401 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -2,6 +2,9 @@ # Note that evaluating variable assignments from the command line # still happens in between these two steps. +# In early configure setup; nothing useful to be done here. +isEmpty(QMAKE_CXX): return() + load(exclusive_builds) CONFIG = \ lex yacc debug exceptions depend_includepath \ diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index eb592badf4..fdf3d1cdd3 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -1,7 +1,4 @@ -# In early configure setup; nothing useful to be done here. -isEmpty(QMAKE_CXX): return() - defineReplace(qtMakeExpand) { out = "$$1" for(ever) { -- cgit v1.2.3