Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: scripts/slave/compile.py

Issue 1318713008: compile.py: add Clang lib/ dir to LD_LIBRARY_PATH on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/compile.py
diff --git a/scripts/slave/compile.py b/scripts/slave/compile.py
index d3783d36d92bc01dd7cac82ea5a5e3902775d372..ed12e9c8eb1746f62f01980dd79aeedddcdd3be9 100755
--- a/scripts/slave/compile.py
+++ b/scripts/slave/compile.py
@@ -939,6 +939,13 @@ def main_ninja(options, args):
command = ['ninja', '-w', 'dupbuild=err', '-C', options.target_output_dir]
+ if chromium_utils.IsLinux() and options.compiler in ('clang', 'goma-clang'):
+ clang_lib_dir = os.path.abspath(os.path.join(options.src_dir,
+ 'third_party', 'llvm-build', 'Release+Asserts', 'lib'))
+ if not 'LD_LIBRARY_PATH' in env:
+ env['LD_LIBRARY_PATH'] = ''
+ env['LD_LIBRARY_PATH'] += clang_lib_dir + ':'
+
# HACK(yyanagisawa): update environment files on |env| update.
# For compiling on Windows, environment in environment files are used.
# It means even if enviroment such as GOMA_DISABLED is updated in
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698