diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 3298d9d58c..53a4e08831 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -265,6 +265,7 @@ class Qt(Package): compiler_mapping = {'intel': ('icc',), 'apple-clang': ('clang-libc++', 'clang'), 'clang': ('clang-libc++', 'clang'), + 'fj': ('clang',), 'gcc': ('g++',)} platform_mapping = {'darwin': ('macx'), 'cray': ('linux')} @@ -490,6 +491,21 @@ class Qt(Package): os.unlink(join_path(self.stage.source_path, '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 def common_config_args(self): spec = self.spec |