diff options
| author | Ben Boeckel <mathstuf@users.noreply.github.com> | 2016-10-12 12:58:12 -0400 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-10-12 09:58:12 -0700 |
| commit | b369be65d778cdc634d777c1a0c59f1fd1e070e4 (patch) | |
| tree | cf5f3817693cd6fdaf31f7a20d4766e644d7bd07 /var | |
| parent | 1925db5c770427f99c0e23dacbf16ac2b707ffa3 (diff) | |
| download | spack-b369be65d778cdc634d777c1a0c59f1fd1e070e4.tar.gz spack-b369be65d778cdc634d777c1a0c59f1fd1e070e4.tar.bz2 spack-b369be65d778cdc634d777c1a0c59f1fd1e070e4.tar.xz spack-b369be65d778cdc634d777c1a0c59f1fd1e070e4.zip | |
Mock up Xcode devdir to make Qt5 work on Mac OS X (#1832)
* build_environment: allow compilers to set up an environment
* clang: mock up a toolchain directory for xcode
Some projects ignore CC and CXX flags and instead use xcode to find the
toolchain. Clang on Apple should set up the environment properly.
Arguably, every compiler could do this on Apple, but let's see how this
works out just for AppleClang for now.
The Documentation directory is ~1.7G and the excluded platforms add up
to about 7G. Ignoring swift saves another 500M. The resulting Xcode.app
copy is in the 2G range.
* compiler: set member variables early
This is required so that later methods can query things such as the
version of the compiler.
* compiler: support finding the real path of the compiler
On Apple, the /usr/bin compilers are actually wrapping tools themselves
which query xcrun for the currently selected Xcode installation. Pierce
this veil and get the real, full path the to underlying compilers
instead.
* icu4c: install with rpath
On macOS, icu installs with a library ID of the library name. Enabling
rpath makes its ID its full installed path which lets Qt5 link against
it successfully.
* qt: no -no-gtkstyle flag on Qt5 on macOS
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/icu4c/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index 848ebfdeac..e2fcb7bd5f 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -42,7 +42,8 @@ class Icu4c(Package): def install(self, spec, prefix): with working_dir('source'): - configure('--prefix={0}'.format(prefix)) + configure('--prefix={0}'.format(prefix), + '--enable-rpath') make() make('check') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 2dba05ce13..f04f05ec89 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -183,7 +183,6 @@ class Qt(Package): '-no-xcb-xlib', '-no-pulseaudio', '-no-alsa', - '-no-gtkstyle', ]) if '@4' in self.spec and sys.platform == 'darwin': |