Index: pylib/gyp/common.py |
diff --git a/pylib/gyp/common.py b/pylib/gyp/common.py |
index 6144d2fe7af90bd9690bb92bc234c0a825f2060a..5ebd3d6f1fb957548c9407de73853fbb74c75dde 100644 |
--- a/pylib/gyp/common.py |
+++ b/pylib/gyp/common.py |
@@ -360,14 +360,19 @@ def GetFlavor(params): |
flavors = { |
'cygwin': 'win', |
'win32': 'win', |
- 'darwin': 'mac', |
- 'sunos5': 'solaris', |
- 'freebsd7': 'freebsd', |
- 'freebsd8': 'freebsd', |
- 'freebsd9': 'freebsd', |
+ 'darwin': 'mac' |
Nico
2012/08/28 14:42:14
leave the trailing , here
|
} |
- flavor = flavors.get(sys.platform, 'linux') |
- return params.get('flavor', flavor) |
+ |
+ if 'flavor' in params: |
+ return params['flavor'] |
+ elif sys.platform in flavors: |
Nico
2012/08/28 14:42:14
s/elif/if/
|
+ return flavors[sys.platform] |
+ elif sys.platform.startswith('sunos'): |
+ return 'solaris' |
+ elif sys.platform.startswith('freebsd'): |
+ return 'freebsd' |
+ |
+ return 'linux'; |
Nico
2012/08/28 14:42:14
no semicolon
|
def CopyTool(flavor, out_path): |