Bug 1285501 - Build linux/ directory on DragonFly, NetBSD and Solaris as well. r=jesup
authorJan Beich <jbeich@FreeBSD.org>
Fri, 08 Jul 2016 09:27:08 +0000
changeset 330202 f5df71ccaebb6aa84edc8414b2b2e4d5e2903b69
parent 330201 54af298e7b99675e51d950f277e2529187bdc0f4
child 330203 2c0a0814add06997075c3326e399466555ee7e3f
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1285501
milestone50.0a1
Bug 1285501 - Build linux/ directory on DragonFly, NetBSD and Solaris as well. r=jesup MozReview-Commit-ID: 46Z55h9oWIm
media/webrtc/trunk/build/filename_rules.gypi
--- a/media/webrtc/trunk/build/filename_rules.gypi
+++ b/media/webrtc/trunk/build/filename_rules.gypi
@@ -24,17 +24,17 @@
     ['(OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1', {
       'sources/': [ ['exclude', '\\.mm?$' ] ],
     }],
     # Do not exclude the linux files on *BSD since most of them can be
     # shared at this point.
     # In case a file is not needed, it is going to be excluded later on.
     # TODO(evan): the above is not correct; we shouldn't build _linux
     # files on non-linux.
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
+    ['OS!="linux" and OS!="solaris" and <(os_bsd)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
         ['exclude', '(^|/)linux/'],
       ],
     }],
     ['OS!="android"', {
       'sources/': [
         ['exclude', '_android(_unittest)?\\.cc$'],
@@ -50,17 +50,17 @@
     ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [ ['exclude', '_chromeos(_unittest)?\\.(h|cc)$'] ]
     }],
     ['>(nacl_untrusted_build)==0', {
       'sources/': [
         ['exclude', '_nacl(_unittest)?\\.(h|cc)$'],
       ],
     }],
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
+    ['OS!="linux" and OS!="solaris" and <(os_bsd)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
       ],
     }],
     ['<(use_x11)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_(x|x11)(_unittest)?\\.(h|cc)$'],
         ['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'],