1berry/brave-browser
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #644 from brave/sccache-win-fix

Browse Source 
Don't set CC_WRAPPER if current build settings don't support sccache
This commit is contained in:
Emerick Rogul 2018-07-26 15:47:53 -04:00 committed by GitHub
commit 2bc97a5ad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/config.js
View File

@ -43,6 +43,7 @@ const Config = function () {
this.mac_signing_identifier = getNPMConfig(['mac_signing_identifier']) || '' this.mac_signing_identifier = getNPMConfig(['mac_signing_identifier']) || ''
this.mac_signing_keychain = getNPMConfig(['mac_signing_keychain']) || 'login' this.mac_signing_keychain = getNPMConfig(['mac_signing_keychain']) || 'login'
this.channel = '' this.channel = ''
this.sccache = getNPMConfig(['sccache'])
} }
Config.prototype.buildArgs = function () { Config.prototype.buildArgs = function () {
@ -94,12 +95,9 @@ Config.prototype.buildArgs = function () {
args.is_win_fastlink = true args.is_win_fastlink = true
} }
if (!this.officialBuild && process.platform === 'win32') { if (this.sccache && process.platform === 'win32') {
let sccache = getNPMConfig(['sccache']) args.clang_use_chrome_plugins = false
if (sccache) { args.enable_precompiled_headers = false
args.clang_use_chrome_plugins = false
args.enable_precompiled_headers = false
}
args.use_thin_lto = true args.use_thin_lto = true
} }
@ -108,14 +106,6 @@ Config.prototype.buildArgs = function () {
args.symbol_level = 1 args.symbol_level = 1
} }
// TODO: Build redirect-cc.cmd in such a way that it still works with ccache if configured
/*
let sccache = getNPMConfig(['sccache'])
if (sccache) {
args.cc_wrapper = sccache
}
*/
if (process.platform === 'win32') { if (process.platform === 'win32') {
args.cc_wrapper = path.join(this.srcDir, 'brave', 'script' ,'redirect-cc.cmd') args.cc_wrapper = path.join(this.srcDir, 'brave', 'script' ,'redirect-cc.cmd')
} else { } else {
@ -289,9 +279,8 @@ Object.defineProperty(Config.prototype, 'defaultOptions', {
env.TARGET_ARCH = this.gypTargetArch // for brave scripts env.TARGET_ARCH = this.gypTargetArch // for brave scripts
env.GYP_MSVS_VERSION = env.GYP_MSVS_VERSION || '2017' // enable 2017 env.GYP_MSVS_VERSION = env.GYP_MSVS_VERSION || '2017' // enable 2017
let sccache = getNPMConfig(['sccache']) if (this.sccache) {
if (sccache) { env.CC_WRAPPER = this.sccache
env.CC_WRAPPER = sccache
} }
if (process.platform === 'linux') { if (process.platform === 'linux') {