From f86aeddb1abd32d59b38ebcb1ffb5f8b8ae26786 Mon Sep 17 00:00:00 2001 From: Danny McClanahan <1305167+cosmicexplorer@users.noreply.github.com> Date: Fri, 20 Jul 2018 10:49:25 -0700 Subject: [PATCH] remove incorrect path join against buildroot --- .../pants/backend/native/tasks/link_shared_libraries.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/python/pants/backend/native/tasks/link_shared_libraries.py b/src/python/pants/backend/native/tasks/link_shared_libraries.py index f5e646625398..aa2cdb16fc6d 100644 --- a/src/python/pants/backend/native/tasks/link_shared_libraries.py +++ b/src/python/pants/backend/native/tasks/link_shared_libraries.py @@ -12,7 +12,6 @@ from pants.backend.native.tasks.native_compile import NativeTargetDependencies, ObjectFiles from pants.backend.native.tasks.native_external_library_fetch import NativeExternalLibraryFetch from pants.backend.native.tasks.native_task import NativeTask -from pants.base.build_environment import get_buildroot from pants.base.exceptions import TaskError from pants.base.workunit import WorkUnit, WorkUnitLabel from pants.util.collections import assert_single_element @@ -181,12 +180,11 @@ def _execute_link_request(self, link_request): resulting_shared_lib_path = os.path.join(output_dir, native_artifact.as_shared_lib(platform)) self.context.log.debug("resulting_shared_lib_path: {}".format(resulting_shared_lib_path)) # We are executing in the results_dir, so get absolute paths for everything. - buildroot = get_buildroot() cmd = ([linker.exe_filename] + self._get_shared_lib_cmdline_args(platform) + self._get_third_party_lib_args(link_request) + - ['-o', os.path.join(buildroot, resulting_shared_lib_path)] + - [os.path.join(buildroot, obj) for obj in object_files]) + ['-o', os.path.abspath(resulting_shared_lib_path)] + + [os.path.abspath(obj) for obj in object_files]) with self.context.new_workunit(name='link-shared-libraries', labels=[WorkUnitLabel.LINKER]) as workunit: