diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-05-24 13:02:16 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-06-25 22:01:21 +0000 |
| commit | 4183475080d334d7d17d02e6ad4eb53c01205c54 (patch) | |
| tree | df38a55c123afffc504bd031192a96170bb71dbd /mkspecs/features | |
| parent | 5176ebc9ca88ff455fb47d7c8e7329bd06da7e10 (diff) | |
Error out when compiler is unable to produce default include/library paths
Adds a bit of extra safeguard to ensure we don't accidentally fall into
the generic unix isEmpty(QMAKE_DEFAULT_{INC,LIB}DIRS) code-paths.
Change-Id: Id760b32cd29cb2b9db1390c174e1637e2dddaabc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/toolchain.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf index 34bd8f1d78..9687767cf1 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -77,6 +77,9 @@ isEmpty($${target_prefix}.INCDIRS) { QMAKE_DEFAULT_INCDIRS += $$clean_path($$line) } } + isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \ + !if(qnx|integrity): \ + error("failed to parse default search paths from compiler output") QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) } else: msvc { # This doesn't differentiate between host and target, |