New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sccache option to bootstrap #12582

Merged
merged 4 commits into from Apr 30, 2018
Jump to file or symbol
Failed to load files and symbols.
+11 鈭12
Diff settings

Always

Just for now

Viewing a subset of changes. View all
Prev

s/sccache/cc_wrapper

  • Loading branch information...
MarshallOfSound committed Apr 12, 2018
commit 66b1753a4e90a79242688996d267403c2630be78
View
@@ -110,9 +110,8 @@ def parse_args():
help='The static library path of libchromiumcontent.')
parser.add_argument('--defines', default='',
help='The build variables passed to gyp')
parser.add_argument('--sccache',
help='Enables sccache support, provide the path to ' +
'sccache. E.g. $(which sccache)')
parser.add_argument('--cc_wrapper',
help='Sets cc_wrapper for build. E.g. $(which sccache)')
return parser.parse_args()
@@ -123,8 +122,8 @@ def args_to_defines(args):
if args.clang_dir:
defines += ' make_clang_dir=' + args.clang_dir
defines += ' clang_use_chrome_plugins=0'
if args.sccache is not None:
defines += ' sccache_path=' + args.sccache
if args.cc_wrapper is not None:
defines += ' cc_wrapper=' + args.cc_wrapper
return defines
View
@@ -6,7 +6,7 @@
'clang%': 1,
# Set this to the absolute path to sccache when building with sccache
'sccache_path%': '',
'cc_wrapper%': '',
# Path to mips64el toolchain.
'make_mips64_dir%': 'vendor/gcc-4.8.3-d197-n64-loongson/usr',
@@ -104,13 +104,13 @@
],
},
'conditions': [
# Setup sccache
['sccache_path!=""', {
# Setup cc_wrapper
['cc_wrapper!=""', {
'make_global_settings': [
['CC_wrapper', '<(sccache_path)'],
['CXX_wrapper', '<(sccache_path)'],
['CC.host_wrapper', '<(sccache_path)'],
['CXX.host_wrapper', '<(sccache_path)']
['CC_wrapper', '<(cc_wrapper)'],
['CXX_wrapper', '<(cc_wrapper)'],
['CC.host_wrapper', '<(cc_wrapper)'],
['CXX.host_wrapper', '<(cc_wrapper)']
],
}],
# Setup building with clang.
ProTip! Use n and p to navigate between commits in a pull request.