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

qt: force the 10.9 SDK on macos

Browse Source 
The 10.11 SDK fails to configure.
This commit is contained in:
Ben Boeckel 2016-08-25 15:57:29 -04:00
parent a05a6456d5
commit 4687860885
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,10 @@ def common_config_args(self):
config_args.append('-no-dbus') config_args.append('-no-dbus')
if sys.platform == 'darwin': if sys.platform == 'darwin':
sdkpath = which('xcrun')('--show-sdk-path', output=str) sdkpath = which('xcrun')('--show-sdk-path',
# XXX(macos): the 10.11 SDK fails to configure.
'--sdk', 'macosx10.9',
output=str)
config_args.extend([ config_args.extend([
'-sdk', sdkpath.strip(), '-sdk', sdkpath.strip(),
]) ])
@ -208,12 +211,8 @@ def configure(self):
def configure(self): def configure(self):
configure('-fast', configure('-fast',
'-no-webkit', '-no-webkit',
<<<<<<< HEAD
'{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), '{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), '-arch', str(self.spec.architecture.target),
>>>>>>> e72b834... qt: setup the sdk and platform arguments
*self.common_config_args) *self.common_config_args)
@when('@5.0:5.6') @when('@5.0:5.6')