Bug 934984 - Disable the /GL flag when compiling libvpx asm files to avoid MSVC bustage. r=ted
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 08 Jan 2015 08:23:00 -0500
changeset 248579 b43ac7b3918bef894d747b9724330a9d51626b46
parent 248578 ed41c08274941657a015e0997e7bf1c5a35de961
child 248580 b60d1a95bfa3aa59b85a5434a20a755975972560
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs934984
milestone37.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 934984 - Disable the /GL flag when compiling libvpx asm files to avoid MSVC bustage. r=ted
media/libvpx/moz.build
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -25,19 +25,20 @@ if CONFIG['MOZ_VPX_ERROR_CONCEALMENT']:
     SOURCES += files['ERROR_CONCEALMENT']
 
 if CONFIG['VPX_X86_ASM'] and CONFIG['OS_TARGET'] == 'WINNT':
     offset_sources = [
         'vp8/encoder/vp8_asm_enc_offsets.c',
         'vpx_scale/vpx_scale_asm_offsets.c',
     ]
     SOURCES += offset_sources
+    # Bug 934984 - MSVC bustage when /GL is specified
     if CONFIG['_MSC_VER']:
         for s in offset_sources:
-            SOURCES[s].no_pgo = True
+            SOURCES[s].flags += ['-GL-']
 
 if CONFIG['VPX_X86_ASM']:
     SOURCES += files['X86_ASM']
 
     if '64' in CONFIG['OS_TEST']:
         SOURCES += files['X86-64_ASM']
 
     # AVX2 only supported on