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

Unified Diff: tools/mb/mb.py

Issue 1908293002: Add MB configs for ClangToTLinux* bots on FYI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix var name Created 4 years, 8 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 | « tools/clang/scripts/update.py ('k') | tools/mb/mb_config.pyl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index b2d0851d3b2820f136f5215ffab8823827206c1c..029cab7cd15abda7cb088863c676796768c7a36b 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1079,6 +1079,21 @@ class MetaBuildWrapper(object):
# Ensure that we have an environment that only contains
# the exact values of the GYP variables we need.
env = os.environ.copy()
+
+ # This is a terrible hack to work around the fact that
+ # //tools/clang/scripts/update.py is invoked by GYP and GN but
+ # currently relies on an environment variable to figure out
+ # what revision to embed in the command line #defines.
+ # For GN, we've made this work via a gn arg that will cause update.py
+ # to get an additional command line arg, but getting that to work
+ # via GYP_DEFINES has proven difficult, so we rewrite the GYP_DEFINES
+ # to get rid of the arg and add the old var in, instead.
+ # See crbug.com/582737 for more on this. This can hopefully all
+ # go away with GYP.
+ if 'llvm_force_head_revision=1' in gyp_defines:
+ env['LLVM_FORCE_HEAD_REVISION'] = 1
Dirk Pranke 2016/04/25 22:12:16 this should've been '1'.
+ gyp_defines = gyp_defines.replace('llvm_force_head_revision=1', '')
+
env['GYP_GENERATORS'] = 'ninja'
if 'GYP_CHROMIUM_NO_ACTION' in env:
del env['GYP_CHROMIUM_NO_ACTION']
« no previous file with comments | « tools/clang/scripts/update.py ('k') | tools/mb/mb_config.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698