From d97ac904198f2b3965084593d80b1c555cf9389f Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 16 Nov 2019 18:46:57 +0100 Subject: [PATCH] Improve the Qt5 fPIC/fPIE detection --- waflib/Tools/qt5.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waflib/Tools/qt5.py b/waflib/Tools/qt5.py index 3a2df68b..99e021ba 100644 --- a/waflib/Tools/qt5.py +++ b/waflib/Tools/qt5.py @@ -482,7 +482,7 @@ def configure(self): self.fatal('No CXX compiler defined: did you forget to configure compiler_cxx first?') # 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' + frag = '#include \nint main(int argc, char **argv) {QMap m;return m.keys().size();}\n' uses = 'QT5CORE' for flag in [[], '-fPIE', '-fPIC', '-std=c++11' , ['-std=c++11', '-fPIE'], ['-std=c++11', '-fPIC']]: msg = 'See if Qt files compile ' @@ -499,7 +499,7 @@ def configure(self): # FreeBSD does not add /usr/local/lib and the pkg-config files do not provide it either :-/ if Utils.unversioned_sys_platform() == 'freebsd': - frag = '#include \nint main(int argc, char **argv) { QMap app(argc, argv); return NULL != (void*) (&app);}\n' + frag = '#include \nint main(int argc, char **argv) {QMap m;return m.keys().size();}\n' try: self.check(features='qt5 cxx cxxprogram', use=uses, fragment=frag, msg='Can we link Qt programs on FreeBSD directly?') except self.errors.ConfigurationError: