zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Fix build with Fujitsu compiler. (#29199)

Browse Source
This commit is contained in:
Toyohisa Kameyama 2022-02-28 12:12:36 +09:00 committed by GitHub
parent d29253bd7a
commit 8f4e029e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/qt/package.py
View File

@ -265,6 +265,7 @@ class Qt(Package):
compiler_mapping = {'intel': ('icc',), compiler_mapping = {'intel': ('icc',),
'apple-clang': ('clang-libc++', 'clang'), 'apple-clang': ('clang-libc++', 'clang'),
'clang': ('clang-libc++', 'clang'), 'clang': ('clang-libc++', 'clang'),
'fj': ('clang',),
'gcc': ('g++',)} 'gcc': ('g++',)}
platform_mapping = {'darwin': ('macx'), 'cray': ('linux')} platform_mapping = {'darwin': ('macx'), 'cray': ('linux')}
@ -490,6 +491,21 @@ def patch(self):
os.unlink(join_path(self.stage.source_path, os.unlink(join_path(self.stage.source_path,
'qtscript/src/3rdparty/javascriptcore/version')) 'qtscript/src/3rdparty/javascriptcore/version'))
@when('@4: %fj')
def patch(self):
(mkspec_dir, platform) = self.get_mkspec()
conf = os.path.join(mkspec_dir, 'common', 'clang.conf')
# Fix qmake compilers in the default mkspec
filter_file('^QMAKE_CC .*', 'QMAKE_CC = fcc', conf)
filter_file('^QMAKE_CXX .*', 'QMAKE_CXX = FCC', conf)
if self.spec.satisfies('@4'):
conf_file = os.path.join(mkspec_dir, platform, "qmake.conf")
with open(conf_file, 'a') as f:
f.write("QMAKE_CXXFLAGS += -std=gnu++98\n")
@property @property
def common_config_args(self): def common_config_args(self):
spec = self.spec spec = self.spec