diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-08-25 10:53:21 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-09-06 16:00:21 -0400 |
| commit | 3df1eeccb9b6e4c302db825b2fe6338462740fe8 (patch) | |
| tree | 457014695f855ce1ed83db1e797d0f96e7c1d186 /var | |
| parent | 71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1 (diff) | |
| download | spack-3df1eeccb9b6e4c302db825b2fe6338462740fe8.tar.gz spack-3df1eeccb9b6e4c302db825b2fe6338462740fe8.tar.bz2 spack-3df1eeccb9b6e4c302db825b2fe6338462740fe8.tar.xz spack-3df1eeccb9b6e4c302db825b2fe6338462740fe8.zip | |
qt: setup the sdk and platform arguments
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 3f62c5c77f..8c918e4c0b 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -170,6 +170,24 @@ class Qt(Package): else: config_args.append('-no-dbus') + if sys.platform == 'darwin': + sdkpath = which('xcrun')('--show-sdk-path', output=str) + config_args.extend([ + '-sdk', sdkpath.strip(), + ]) + use_clang_platform = False + if self.spec.compiler.name == 'clang' and \ + str(self.spec.compiler.version).endwith('-apple'): + use_clang_platform = True + # No one uses gcc-4.2.1 anymore; this is clang. + if self.spec.compiler.name == 'gcc' and \ + str(self.spec.compiler.version) == '4.2.1': + use_clang_platform = True + if use_clang_platform: + config_args.extend([ + '-platform', 'unsupported/macx-clang', + ]) + return config_args # Don't disable all the database drivers, but should @@ -190,7 +208,12 @@ class Qt(Package): def configure(self): configure('-fast', '-no-webkit', +<<<<<<< HEAD '{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), +||||||| parent of e72b834... qt: setup the sdk and platform arguments +======= + '-arch', str(self.spec.architecture.target), +>>>>>>> e72b834... qt: setup the sdk and platform arguments *self.common_config_args) @when('@5.0:5.6') |