bug 1318370 - fix clang-cl builds. r=bustage
authorTed Mielczarek <ted@mielczarek.org>
Tue, 21 Feb 2017 06:20:12 -0500
changeset 343948 72f6eace33a1897d9d3d00189894e6e85c7b97ae
parent 343947 8babccb56f91673c2fbdf1d7bbf9f80194940750
child 343949 3ebbc022b8f6832469e72a25f02b48d7553a4710
push id87231
push usertmielczarek@mozilla.com
push dateTue, 21 Feb 2017 11:18:14 +0000
treeherdermozilla-inbound@72f6eace33a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1318370
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1318370 - fix clang-cl builds. r=bustage MozReview-Commit-ID: 8imNZDxMkVF
build/moz.configure/toolchain.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -965,19 +965,19 @@ set_define('HAVE_VISIBILITY_HIDDEN_ATTRI
            depends(visibility_flags)(lambda v: bool(v) or None))
 set_define('HAVE_VISIBILITY_ATTRIBUTE',
            depends(visibility_flags)(lambda v: bool(v) or None))
 set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes)
 set_config('VISIBILITY_FLAGS', visibility_flags)
 
 @depends(c_compiler, using_sccache)
 def depend_cflags(c_compiler, using_sccache):
-    if c_compiler.type != 'msvc':
+    if c_compiler.type in ('gcc', 'clang'):
         return '-MD -MP -MF $(MDDEPDIR)/$(@F).pp'
-    elif using_sccache:
+    elif c_compiler.type == 'msvc' and using_sccache:
         # sccache supports a special flag to create depfiles
         # by parsing MSVC's -showIncludes output.
         return '-deps$(MDDEPDIR)/$(@F).pp'
 
 set_config('_DEPEND_CFLAGS', depend_cflags)
 
 @depends(c_compiler, when=building_with_msvc)
 @imports(_from='re', _import='compile', _as='re_compile')