From a9bb62b3f686109914d5f436857a169d4059ee31 Mon Sep 17 00:00:00 2001 From: fedepell Date: Fri, 19 Aug 2016 06:59:40 +0200 Subject: [PATCH] qt5: qt5 5.7 detection, added also case with std=c++11 but no fPIC/fPIE --- waflib/Tools/qt5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waflib/Tools/qt5.py b/waflib/Tools/qt5.py index 0556955b..00bee95a 100644 --- a/waflib/Tools/qt5.py +++ b/waflib/Tools/qt5.py @@ -473,7 +473,7 @@ def configure(self): # Qt5 may be compiled with '-reduce-relocations' which requires dependent programs to have -fPIE or -fPIC? frag = '#include \nint main(int argc, char **argv) {return 0;}\n' uses = 'QT5CORE QT5WIDGETS QT5GUI' - for flag in [[], '-fPIE', '-fPIC', ['-std=c++11', '-fPIE'], ['-std=c++11', '-fPIC']]: + for flag in [[], '-fPIE', '-fPIC', '-std=c++11' , ['-std=c++11', '-fPIE'], ['-std=c++11', '-fPIC']]: msg = 'See if Qt files compile ' if flag: msg += 'with %s' % flag