From edf56d8ac42d491f0d86e3e5210cbc080f61d2be Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Tue, 22 Oct 2019 01:23:03 +0200 Subject: [PATCH] qt: Fix build for newer versions (#13262) For some reason, newer versions of qt fail to build because they cannot find certain system libraries such as libatomic and libdl. Leaving the qmake compiler set to gcc seems to fix the problem. Fixes #13221 --- var/spack/repos/builtin/packages/qt/package.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 0405aa49027..55e59cb7882 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -294,8 +294,6 @@ def patch(self): @when('@5') def patch(self): # Fix qmake compilers in the default mkspec - filter_file('^QMAKE_COMPILER .*', 'QMAKE_COMPILER = cc', - 'qtbase/mkspecs/common/g++-base.conf') filter_file('^QMAKE_CC .*', 'QMAKE_CC = cc', 'qtbase/mkspecs/common/g++-base.conf') filter_file('^QMAKE_CXX .*', 'QMAKE_CXX = c++',