Support for newer versions of Solaris and FreeBSD

pylib/gyp/common.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from __future__ import with_statement
 
 import errno
 import filecmp
 import os.path
 import re
@@ skipping 343 matching lines @@
 
   return Writer()
 
 
 def GetFlavor(params):
   """Returns |params.flavor| if it's set, the system's default flavor else."""
   flavors = {
     '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):
   """Finds (mac|sun|win)_tool.gyp in the gyp directory and copies it
   to |out_path|."""
   prefix = { 'solaris': 'sun', 'mac': 'mac', 'win': 'win' }.get(flavor, None)
   if not prefix:
     return
 
   # Slurp input file.
@@ skipping 71 matching lines @@
       return
     visited.add(node)
     visiting.add(node)
     for neighbor in get_edges(node):
       Visit(neighbor)
     visiting.remove(node)
     ordered_nodes.insert(0, node)
   for node in sorted(graph):
     Visit(node)
   return ordered_nodes