| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright 2012 the V8 project authors. All rights reserved. | 3 # Copyright 2012 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 # to enfore syntax checking. | 151 # to enfore syntax checking. |
| 152 syntax_check = os.environ.get('V8_GYP_SYNTAX_CHECK') | 152 syntax_check = os.environ.get('V8_GYP_SYNTAX_CHECK') |
| 153 if syntax_check and int(syntax_check): | 153 if syntax_check and int(syntax_check): |
| 154 args.append('--check') | 154 args.append('--check') |
| 155 | 155 |
| 156 print 'Updating projects from gyp files...' | 156 print 'Updating projects from gyp files...' |
| 157 sys.stdout.flush() | 157 sys.stdout.flush() |
| 158 | 158 |
| 159 # Generate for the architectures supported on the given platform. | 159 # Generate for the architectures supported on the given platform. |
| 160 gyp_args = list(args) | 160 gyp_args = list(args) |
| 161 if platform.system() == 'Linux': | 161 gyp_generators = os.environ.get('GYP_GENERATORS') |
| 162 if platform.system() == 'Linux' and gyp_generators != 'ninja': |
| 162 # Work around for crbug.com/331475. | 163 # Work around for crbug.com/331475. |
| 163 for f in glob.glob(os.path.join(v8_root, 'out', 'Makefile.*')): | 164 for f in glob.glob(os.path.join(v8_root, 'out', 'Makefile.*')): |
| 164 os.unlink(f) | 165 os.unlink(f) |
| 165 # --generator-output defines where the Makefile goes. | 166 # --generator-output defines where the Makefile goes. |
| 166 gyp_args.append('--generator-output=out') | 167 gyp_args.append('--generator-output=out') |
| 167 # -Goutput_dir defines where the build output goes, relative to the | 168 # -Goutput_dir defines where the build output goes, relative to the |
| 168 # Makefile. Set it to . so that the build output doesn't end up in out/out. | 169 # Makefile. Set it to . so that the build output doesn't end up in out/out. |
| 169 gyp_args.append('-Goutput_dir=.') | 170 gyp_args.append('-Goutput_dir=.') |
| 170 run_gyp(gyp_args) | 171 run_gyp(gyp_args) |
| OLD | NEW |