patch-media_webrtc_trunk_tools_gyp_pylib_gyp_generator_mozmake_py 835 B

1234567891011121314151617181920212223242526
  1. --- mozilla-release.orig/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-12-05 17:07:48.000000000 +0100
  2. +++ mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2014-02-05 08:13:30.000000000 +0100
  3. @@ -118,23 +118,6 @@ def ensure_directory_exists(path):
  4. def GetFlavor(params):
  5. """Returns |params.flavor| if it's set, the system's default flavor else."""
  6. - system = platform.system().lower()
  7. - flavors = {
  8. - 'microsoft': 'win',
  9. - 'windows' : 'win',
  10. - 'cygwin' : 'win',
  11. - 'darwin' : 'mac',
  12. - 'sunos' : 'solaris',
  13. - 'dragonfly': 'dragonfly',
  14. - 'freebsd' : 'freebsd',
  15. - 'netbsd' : 'netbsd',
  16. - 'openbsd' : 'openbsd',
  17. - }
  18. -
  19. - if 'flavor' in params:
  20. - return params['flavor']
  21. - if system in flavors:
  22. - return flavors[system]
  23. return 'linux'