Merge pull request #89 from brave/fix/83

pass real cc_wrapper in env var
brave · Mar 6, 2018 · a4180b0 · a4180b0
2 parents 76b677e + 291e6d4
commit a4180b0
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -75,17 +75,10 @@ Config.prototype.buildArgs = function () {
     args.is_win_fastlink = true
   }
 
-  // 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') {
-    args.cc_wrapper='..\\..\\brave\\script\\redirect-cc.cmd'
+    args.cc_wrapper = path.join(this.srcDir, 'brave', 'script' ,'redirect-cc.cmd')
   } else {
-    args.cc_wrapper='../../brave/script/redirect-cc.py'
+    args.cc_wrapper = path.join(this.srcDir, 'brave', 'script', 'redirect-cc.py')
   }
   return args
 }
@@ -227,6 +220,11 @@ Object.defineProperty(Config.prototype, 'defaultOptions', {
     env.TARGET_ARCH = this.gypTargetArch // for antimuon scripts
     env.GYP_MSVS_VERSION = env.GYP_MSVS_VERSION || '2017' // enable 2017
 
+    let sccache = getNPMConfig(['sccache'])
+    if (sccache) {
+      env.CC_WRAPPER = sccache
+    }
+
     if (process.platform === 'linux') {
       env.LLVM_DOWNLOAD_GOLD_PLUGIN = '1'
     }