summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@informatik.uni-hamburg.de>2019-10-22 01:23:03 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2019-10-21 18:23:03 -0500
commitedf56d8ac42d491f0d86e3e5210cbc080f61d2be (patch)
tree540d36f57f3fc134c01c9fdec30ed8afd048982a /var
parent26687988eb7328023b69c277c280b2f485d74961 (diff)
downloadspack-edf56d8ac42d491f0d86e3e5210cbc080f61d2be.tar.gz
spack-edf56d8ac42d491f0d86e3e5210cbc080f61d2be.tar.bz2
spack-edf56d8ac42d491f0d86e3e5210cbc080f61d2be.tar.xz
spack-edf56d8ac42d491f0d86e3e5210cbc080f61d2be.zip
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
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 0405aa4902..55e59cb788 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -294,8 +294,6 @@ class Qt(Package):
@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++',