Skip to content

Commit

Permalink
add hack to let travis pass
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmicexplorer committed Jun 8, 2018
1 parent 99d226c commit 0e44172
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def _xcode_cli_tools(self):

@rule(Linker, [Select(Platform), Select(NativeToolchain)])
def select_linker(platform, native_toolchain):
# TODO: make it possible to yield Get with a non-static
# TODO(#5933): make it possible to yield Get with a non-static
# subject type and use `platform.resolve_platform_specific()`, something like:
# linker = platform.resolve_platform_specific({
# 'darwin': lambda: Get(Linker, XCodeCLITools, native_toolchain._xcode_cli_tools),
Expand Down
5 changes: 5 additions & 0 deletions src/python/pants/backend/python/tasks/setup_py.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@ def as_environment(self):
)
ret['PATH'] = get_joined_path(all_path_entries)

# FIXME(#5662): It seems that crti.o is provided by glibc, which we don't provide yet, so this
# lets Travis pass for now (and doesn't harm anything if it doesn't exist / is probably the
# right thing if it does).
ret['LD_LIBRARY_PATH'] = '/usr/lib/x86_64-linux-gnu'

return ret


Expand Down

0 comments on commit 0e44172

Please sign in to comment.