| OLD | NEW | 
|---|
| 1 #!/usr/bin/python | 1 #!/usr/bin/python | 
| 2 # | 2 # | 
| 3 # Copyright 2010 the V8 project authors. All rights reserved. | 3 # Copyright 2010 the V8 project authors. All rights reserved. | 
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without | 
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are | 
| 6 # met: | 6 # met: | 
| 7 # | 7 # | 
| 8 #     * Redistributions of source code must retain the above copyright | 8 #     * Redistributions of source code must retain the above copyright | 
| 9 #       notice, this list of conditions and the following disclaimer. | 9 #       notice, this list of conditions and the following disclaimer. | 
| 10 #     * Redistributions in binary form must reproduce the above | 10 #     * Redistributions in binary form must reproduce the above | 
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 85   specified_includes = set() | 85   specified_includes = set() | 
| 86   for arg in args: | 86   for arg in args: | 
| 87     if arg.startswith('-I') and len(arg) > 2: | 87     if arg.startswith('-I') and len(arg) > 2: | 
| 88       specified_includes.add(os.path.realpath(arg[2:])) | 88       specified_includes.add(os.path.realpath(arg[2:])) | 
| 89 | 89 | 
| 90   result = [] | 90   result = [] | 
| 91   def AddInclude(path): | 91   def AddInclude(path): | 
| 92     if os.path.realpath(path) not in specified_includes: | 92     if os.path.realpath(path) not in specified_includes: | 
| 93       result.append(path) | 93       result.append(path) | 
| 94 | 94 | 
| 95   # Always include common.gypi & features_override.gypi | 95   # Always include standalone.gypi | 
| 96   AddInclude(os.path.join(script_dir, 'common.gypi')) | 96   AddInclude(os.path.join(script_dir, 'standalone.gypi')) | 
| 97 | 97 | 
| 98   # Optionally add supplemental .gypi files if present. | 98   # Optionally add supplemental .gypi files if present. | 
| 99   supplements = glob.glob(os.path.join(v8_root, '*', 'supplement.gypi')) | 99   supplements = glob.glob(os.path.join(v8_root, '*', 'supplement.gypi')) | 
| 100   for supplement in supplements: | 100   for supplement in supplements: | 
| 101     AddInclude(supplement) | 101     AddInclude(supplement) | 
| 102 | 102 | 
| 103   return result | 103   return result | 
| 104 | 104 | 
| 105 | 105 | 
| 106 def run_gyp(args): | 106 def run_gyp(args): | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 164   if utils.GuessOS() == 'linux': | 164   if utils.GuessOS() == 'linux': | 
| 165     gyp_args = list(args) | 165     gyp_args = list(args) | 
| 166     gyp_args.append('-Dtarget_arch=x64') | 166     gyp_args.append('-Dtarget_arch=x64') | 
| 167     gyp_args.append('-S-x64') | 167     gyp_args.append('-S-x64') | 
| 168     run_gyp(gyp_args) | 168     run_gyp(gyp_args) | 
| 169 | 169 | 
| 170     gyp_args = list(args) | 170     gyp_args = list(args) | 
| 171     gyp_args.append('-I' + v8_root + '/build/armu.gypi') | 171     gyp_args.append('-I' + v8_root + '/build/armu.gypi') | 
| 172     gyp_args.append('-S-armu') | 172     gyp_args.append('-S-armu') | 
| 173     run_gyp(gyp_args) | 173     run_gyp(gyp_args) | 
| OLD | NEW | 
|---|