| Index: pylib/gyp/common.py
 | 
| diff --git a/pylib/gyp/common.py b/pylib/gyp/common.py
 | 
| index 6144d2fe7af90bd9690bb92bc234c0a825f2060a..6962684e10c8471c477278df06b19ad4e904de48 100644
 | 
| --- a/pylib/gyp/common.py
 | 
| +++ b/pylib/gyp/common.py
 | 
| @@ -361,13 +361,18 @@ def GetFlavor(params):
 | 
|      'cygwin': 'win',
 | 
|      'win32': 'win',
 | 
|      'darwin': 'mac',
 | 
| -    'sunos5': 'solaris',
 | 
| -    'freebsd7': 'freebsd',
 | 
| -    'freebsd8': 'freebsd',
 | 
| -    'freebsd9': 'freebsd',
 | 
|    }
 | 
| -  flavor = flavors.get(sys.platform, 'linux')
 | 
| -  return params.get('flavor', flavor)
 | 
| +
 | 
| +  if 'flavor' in params:
 | 
| +    return params['flavor']
 | 
| +  if sys.platform in flavors:
 | 
| +    return flavors[sys.platform]
 | 
| +  if sys.platform.startswith('sunos'):
 | 
| +    return 'solaris'
 | 
| +  if sys.platform.startswith('freebsd'):
 | 
| +    return 'freebsd'
 | 
| +
 | 
| +  return 'linux'
 | 
|  
 | 
|  
 | 
|  def CopyTool(flavor, out_path):
 | 
| 
 |