diff --git a/src/python/pants/backend/python/subsystems/python_native_toolchain.py b/src/python/pants/backend/python/subsystems/python_native_toolchain.py index 5631a78eee5..c8bc445348a 100644 --- a/src/python/pants/backend/python/subsystems/python_native_toolchain.py +++ b/src/python/pants/backend/python/subsystems/python_native_toolchain.py @@ -52,7 +52,10 @@ def __init__(self, llvm_toolchain_dir, base_interp): @memoized_method def sanitized_environment(self): pre_sanitized_env = super(SandboxedInterpreter, self).sanitized_environment() - pre_sanitized_env['PATH'] = os.path.join(self._llvm_toolchain_dir, 'bin') + pre_sanitized_env['PATH'] = ':'.join([ + os.path.join(self._llvm_toolchain_dir, 'bin'), + '/usr/bin', + ]) llvm_include = os.path.join(self._llvm_toolchain_dir, 'include') python_inc_stdout, _ = Executor.execute([self.binary], env=pre_sanitized_env, stdin_payload=INC_DIR_INPUT) diff --git a/src/python/pants/backend/python/tasks/pex_build_util.py b/src/python/pants/backend/python/tasks/pex_build_util.py index 08504fbdd57..4e10879e4c0 100644 --- a/src/python/pants/backend/python/tasks/pex_build_util.py +++ b/src/python/pants/backend/python/tasks/pex_build_util.py @@ -179,8 +179,6 @@ def build_req_lib_provided_by_setup_file(build_graph, local_built_dists, :param synthetic_address: A generative address for addressing synthetic targets. :return: a :class: `PythonRequirementLibrary` with `requirements` that map to locally-built wheels. """ - context.log.info('local_built_dists: {}'.format(repr(local_built_dists))) - tgt_ids = None if in_tgts is not None: tgt_ids = frozenset([t.id for t in in_tgts]) @@ -202,7 +200,7 @@ def python_requirement_from_wheel(path): if not should_create_req(whl_location): continue whl_req = python_requirement_from_wheel(whl_location) - local_whl_reqs.append(PythonRequirement(req_name, repository=whl_dir)) + local_whl_reqs.append(whl_req) if len(local_whl_reqs) == 0: return None diff --git a/src/python/pants/backend/python/tasks/python_binary_create.py b/src/python/pants/backend/python/tasks/python_binary_create.py index d1f8f457b49..31b521795ec 100644 --- a/src/python/pants/backend/python/tasks/python_binary_create.py +++ b/src/python/pants/backend/python/tasks/python_binary_create.py @@ -140,7 +140,7 @@ def _create_binary(self, binary_tgt, results_dir): BuildLocalPythonDistributions.PYTHON_DISTS) if built_dists is not None: - synthetic_address = ':'.join(2 * [binary_tgt.invalidation_has()]) + synthetic_address = ':'.join(2 * [binary_tgt.invalidation_hash()]) local_dist_req_lib = build_req_lib_provided_by_setup_file( self.context.build_graph, diff --git a/src/python/pants/backend/python/tasks/resolve_requirements_task_base.py b/src/python/pants/backend/python/tasks/resolve_requirements_task_base.py index 45944191458..6ffddac6325 100644 --- a/src/python/pants/backend/python/tasks/resolve_requirements_task_base.py +++ b/src/python/pants/backend/python/tasks/resolve_requirements_task_base.py @@ -64,7 +64,7 @@ def resolve_requirements(self, req_libs, local_dist_targets=None): BuildLocalPythonDistributions.PYTHON_DISTS) if built_dists is not None: - synthetic_address = ':'.join(2 * [binary_tgt.invalidation_has()]) + synthetic_address = ':'.join(2 * [binary_tgt.invalidation_hash()]) local_dist_req_lib = build_req_lib_provided_by_setup_file( self.context.build_graph,