Skip to content

Commit

Permalink
remove incorrect path join against buildroot
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmicexplorer committed Jul 20, 2018
1 parent a7d860e commit f86aedd
Showing 1 changed file with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit f86aedd

Please sign in to comment.