diff options
| author | Alexis Christoforides <alexis@thenull.net> | 2018-09-01 01:27:01 +0300 |
|---|---|---|
| committer | Alexis Christoforides <alexis@thenull.net> | 2018-09-01 06:10:27 +0300 |
| commit | d49d32da19e724bfc5a36a4fd61a02a3de4dddda (patch) | |
| tree | bd113f1bcf1a23a4a41ecffd1eb616c308a9a033 /packaging | |
| parent | d850f1d0bac891a687c2bb512171422d95b71a77 (diff) | |
[MacSDK] Go back to incluging opt/llc after change in LLVM install process
Fixes https://github.com/mono/mono/issues/10243
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/MacSDK/mono.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packaging/MacSDK/mono.py b/packaging/MacSDK/mono.py index 2bc166db9d4..d89b42e2064 100644 --- a/packaging/MacSDK/mono.py +++ b/packaging/MacSDK/mono.py @@ -84,6 +84,13 @@ class MonoMasterPackage(Package): "LocalMachine") ensure_dir(registry_dir) + # LLVM build installs itself under the source tree; move tools to mono's install path + llvm_tools_path = os.path.join(self.workspace, 'llvm/usr/bin') + target = os.path.join(self.staged_prefix, 'bin') + ensure_dir(target) + for tool in ['opt','llc']: + shutil.move(os.path.join(llvm_tools_path, tool), target) + def deploy(self): if bockbuild.cmd_options.arch == 'darwin-universal': os.symlink('mono-sgen64', '%s/bin/mono64' % self.staged_profile) |