AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable c++ standard compiler flags for the host build

Browse Source 
There is no test for c++ standard support for the host build
(only for the target compiler/build) which leads to trouble
in some cross compiling environments (old host compiler, new
cross compiler):

  g++: error: unrecognized command line option ‘-std=c++1z’

So disable c++ standard compiler flags unconditionally for host builds.

Task-number: QTBUG-51644
Change-Id: Ifb3042e125fe199a7e081740d1171d26ccacf0c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Peter Seiderer 2016-03-03 15:17:31 +01:00
parent 4ef990ce4a
commit e69e695196
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/default_post.prf
View File

@ -95,7 +95,10 @@ breakpad {
!isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME) !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP $$DEBUGFILENAME)
} }
c++11|c++14|c++1z { # Disable special compiler flags for host builds (needs to be changed for 5.7
# to fall back to c++11 because since 5.7 c++11 is required everywhere,
# including host builds).
if(!host_build|!cross_compile):if(c++11|c++14|c++1z) {
c++1z: cxxstd = CXX1Z c++1z: cxxstd = CXX1Z
else: c++14: cxxstd = CXX14 else: c++14: cxxstd = CXX14
else: cxxstd = CXX11 else: cxxstd = CXX11