Skip to content

Commit

Permalink
[MacSDK] Go back to incluging opt/llc after change in LLVM install pr…
Browse files Browse the repository at this point in the history
…ocess

Fixes mono#10243
  • Loading branch information
alexischr authored and monojenkins committed Sep 1, 2018
1 parent eae59de commit b5b3a05
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions packaging/MacSDK/mono.py
Expand Up @@ -84,6 +84,13 @@ def install(self):
"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)
Expand Down

0 comments on commit b5b3a05

Please sign in to comment.