Reviewers: jochen (slow), Jakob,
Message:
PTAL
Description:
Properly configure goma.
Everything is c/p from common.gypi.
Please review this at https://codereview.chromium.org/862973002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+37, -0 lines):
M build/standalone.gypi
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index
c0979a8f6e46a6823110e14e3ae2d3b85f5f8781..59caed2e6ebaacb179781c8ff1b801d14575dff3
100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -65,11 +65,27 @@
'host_arch%': '<(host_arch)',
'target_arch%': '<(target_arch)',
'v8_target_arch%': '<(target_arch)',
+
+ # goma settings.
+ # 1 to use goma.
+ # If no gomadir is set, it uses the default gomadir.
+ 'use_goma%': 0,
+ 'gomadir%': '',
+ 'conditions': [
+ # Set default gomadir.
+ ['OS=="win"', {
+ 'gomadir': 'c:\\goma\\goma-win',
+ }, {
+ 'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
+ }],
+ ],
},
'host_arch%': '<(host_arch)',
'target_arch%': '<(target_arch)',
'v8_target_arch%': '<(v8_target_arch)',
'werror%': '-Werror',
+ 'use_goma%': '<(use_goma)',
+ 'gomadir%': '<(gomadir)',
# .gyp files or targets should set v8_code to 1 if they build V8
specific
# code, as opposed to external code. This variable is used to control
such
@@ -114,6 +130,16 @@
}, {
'os_posix%': 1,
}],
+ ['OS=="win" and use_goma==1', {
+ # goma doesn't support pch yet.
+ 'chromium_win_pch': 0,
+ # goma doesn't support PDB yet, so win_z7=1 or fastbuild=1.
+ 'conditions': [
+ ['win_z7==0 and fastbuild==0', {
+ 'fastbuild': 1,
+ }],
+ ],
+ }],
['(v8_target_arch=="ia32" or v8_target_arch=="x64" or
v8_target_arch=="x87") and \
(OS=="linux" or OS=="mac")', {
'v8_enable_gdbjit%': 1,
@@ -475,5 +501,16 @@
['CC', '<(make_clang_dir)/bin/clang-cl'],
],
}],
+ # TODO(yyanagisawa): supports GENERATOR==make
+ # make generator doesn't support CC_wrapper without CC
+ # in make_global_settings yet.
+ ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
+ 'make_global_settings': [
+ ['CC_wrapper', '<(gomadir)/gomacc'],
+ ['CXX_wrapper', '<(gomadir)/gomacc'],
+ ['CC.host_wrapper', '<(gomadir)/gomacc'],
+ ['CXX.host_wrapper', '<(gomadir)/gomacc'],
+ ],
+ }],
],
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
