From 0e4417279e0397ff5c27e2c81c8ccec6891ea69a Mon Sep 17 00:00:00 2001 From: Danny McClanahan <1305167+cosmicexplorer@users.noreply.github.com> Date: Fri, 8 Jun 2018 02:19:27 -0700 Subject: [PATCH] add hack to let travis pass --- .../pants/backend/native/subsystems/native_toolchain.py | 2 +- src/python/pants/backend/python/tasks/setup_py.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/python/pants/backend/native/subsystems/native_toolchain.py b/src/python/pants/backend/native/subsystems/native_toolchain.py index e2f7b9d6307c..a6c015bb5458 100644 --- a/src/python/pants/backend/native/subsystems/native_toolchain.py +++ b/src/python/pants/backend/native/subsystems/native_toolchain.py @@ -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), diff --git a/src/python/pants/backend/python/tasks/setup_py.py b/src/python/pants/backend/python/tasks/setup_py.py index c737904c273c..106f30e604b6 100644 --- a/src/python/pants/backend/python/tasks/setup_py.py +++ b/src/python/pants/backend/python/tasks/setup_py.py @@ -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