Keep build files in sync (Port bug 1384557 - ignore {CC,CXX}_WRAPPER when using sccache). r=tomprince(via IRC)
☠☠ backed out by ab5f127c30be ☠ ☠
authorJorg K <jorgk@jorgk.com>
Wed, 01 Nov 2017 23:39:03 +0100
changeset 29303 bb96540a652557271e302ae468c18689b6c5d811
parent 29302 b0f6dcd3c3dbb0f82ec0539d10ad54bec928e879
child 29304 731f391e46d73e4e72cfe44e02c7ef1f1c7c62c9
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1384557
Keep build files in sync (Port bug 1384557 - ignore {CC,CXX}_WRAPPER when using sccache). r=tomprince(via IRC)
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -119,22 +119,16 @@ else
     esac
     export CCACHE="$topsrcdir/sccache2/sccache${suffix}"
     export SCCACHE_VERBOSE_STATS=1
     mk_add_options MOZ_PREFLIGHT_ALL+=build/sccache.mk
     mk_add_options MOZ_POSTFLIGHT_ALL+=build/sccache.mk
     mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
     case "$platform" in
     win*)
-        # sccache supports a special flag to create depfiles.
-        #TODO: bug 1318370 - move this all into toolchain.configure
-        export _DEPEND_CFLAGS='-deps$(MDDEPDIR)/$(@F).pp'
-        # Windows builds have a default wrapper that needs to be overridden
-        mk_add_options "export CC_WRAPPER="
-        mk_add_options "export CXX_WRAPPER="
         # For now, sccache doesn't support separate PDBs so force debug info to be
         # in object files.
         mk_add_options "export COMPILE_PDB_FLAG="
         mk_add_options "export HOST_PDB_FLAG="
         mk_add_options "export MOZ_DEBUG_FLAGS=-Z7"
         ;;
     esac
 fi