Skip to content

Commit

Permalink
rename LLVM -> Compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmicexplorer committed Feb 22, 2018
1 parent 91e1353 commit 7763e5d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from pants.binaries.binary_tool import NativeTool


class LLVM(NativeTool):
options_scope = 'llvm'
class Compiler(NativeTool):
options_scope = 'compiler'
default_version = '5.0.1'
archive_type = 'tgz'
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from pex.interpreter import PythonInterpreter

from pants.backend.native.subsystems.llvm import LLVM
from pants.backend.native.subsystems.compiler import Compiler
from pants.backend.python.python_requirement import PythonRequirement
from pants.backend.python.targets.python_requirement_library import PythonRequirementLibrary
from pants.backend.python.tasks.pex_build_util import is_local_python_dist
Expand Down Expand Up @@ -49,11 +49,11 @@ def implementation_version(cls):

@classmethod
def subsystem_dependencies(cls):
return super(BuildLocalPythonDistributions, cls).subsystem_dependencies() + (LLVM.scoped(cls),)
return super(BuildLocalPythonDistributions, cls).subsystem_dependencies() + (Compiler.scoped(cls),)

@memoized_property
def llvm_base_dir(self):
return LLVM.scoped_instance(self).select()
def compiler_base_dir(self):
return Compiler.scoped_instance(self).select()

@property
def cache_target_dirs(self):
Expand Down Expand Up @@ -106,7 +106,7 @@ def _sandboxed_setuppy(self):
# use our compiler at the front of the path
# TODO: when we provide ld and stdlib headers, don't add the original path
sanitized_env['PATH'] = ':'.join([
os.path.join(self.llvm_base_dir, 'bin'),
os.path.join(self.compiler_base_dir, 'bin'),
sanitized_env.get('PATH'),
])

Expand Down

0 comments on commit 7763e5d

Please sign in to comment.