Bug 1512504 - Don't set __PRETTY_FUNCTION__ on clang-cl. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 14 Feb 2019 18:56:29 +0000
changeset 459208 b29c87add05f735b250612ca2444103652750091
parent 459207 d4093b779fa4e7b003ddc6f152ecce058aef209a
child 459337 426ca85d23038f08ebe29ce16db8fd484062f1f9
child 459339 4e0d6226ba5f9fbb37e00504cd332d6bd1fae4fe
push id35556
push userdvarga@mozilla.com
push dateFri, 15 Feb 2019 01:38:24 +0000
treeherdermozilla-central@b29c87add05f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1512504
milestone67.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 1512504 - Don't set __PRETTY_FUNCTION__ on clang-cl. r=froydnj clang-cl defines it on its own, although the value is slightly different from __FUNCSIG__ (it doesn't contain the ABI, which doesn't really matter). We've only been setting it this was on clang-cl by extension of setting it for msvc. Depends on D19616 Differential Revision: https://phabricator.services.mozilla.com/D19617
dom/media/systemservices/moz.build
dom/media/webrtc/moz.build
media/webrtc/webrtc.mozbuild
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@@ -44,18 +44,16 @@ if CONFIG['OS_TARGET'] == 'Android':
         'OpenSLESProvider.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
   UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp']
   EXPORTS += ['OSXRunLoopSingleton.h']
 
 if CONFIG['CC_TYPE'] == 'clang-cl':
-    DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__'
-
     # This is intended as a temporary workaround to enable building with VS2015.
     # media\webrtc\trunk\webrtc/base/criticalsection.h(59): warning C4312:
     # 'reinterpret_cast': conversion from 'DWORD' to 'HANDLE' of greater size
     CXXFLAGS += ['-wd4312']
 
 EXPORTS.mozilla += ['ShmemPool.h',]
 
 EXPORTS.mozilla.media += ['CamerasTypes.h',
--- a/dom/media/webrtc/moz.build
+++ b/dom/media/webrtc/moz.build
@@ -86,9 +86,8 @@ DEFINES['TRACING'] = True
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['CC_TYPE'] == 'clang-cl':
     CXXFLAGS += [
         '-wd4275', # non dll-interface class used as base for dll-interface class
         '-wd4312', # This is intended as a temporary hack to support building with VS2015
                    # 'reinterpret_cast': conversion from 'DWORD' to 'HANDLE' of greater size
     ]
-    DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__'
--- a/media/webrtc/webrtc.mozbuild
+++ b/media/webrtc/webrtc.mozbuild
@@ -17,13 +17,10 @@ if CONFIG['MOZ_WEBRTC']:
     elif CONFIG['OS_TARGET'] == 'WINNT':
         DEFINES['WEBRTC_WIN'] = True
         DEFINES['HAVE_WINSOCK2_H'] = True
     elif CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
         DEFINES['WEBRTC_BSD'] = True
     elif CONFIG['OS_TARGET'] == 'Android':
         DEFINES['WEBRTC_ANDROID'] = True
 
-    if CONFIG['CC_TYPE'] == 'clang-cl':
-        DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__'
-
     if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
         CXXFLAGS += ['-Wno-error=shadow']