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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 syntax_check = os.environ.get('V8_GYP_SYNTAX_CHECK') | 160 syntax_check = os.environ.get('V8_GYP_SYNTAX_CHECK') |
161 if syntax_check and int(syntax_check): | 161 if syntax_check and int(syntax_check): |
162 args.append('--check') | 162 args.append('--check') |
163 | 163 |
164 print 'Updating projects from gyp files...' | 164 print 'Updating projects from gyp files...' |
165 sys.stdout.flush() | 165 sys.stdout.flush() |
166 | 166 |
167 # Generate for the architectures supported on the given platform. | 167 # Generate for the architectures supported on the given platform. |
168 gyp_args = list(args) | 168 gyp_args = list(args) |
169 if platform.system() == 'Linux': | 169 if platform.system() == 'Linux': |
| 170 # --generator-output defines where the Makefile goes. |
170 gyp_args.append('--generator-output=out') | 171 gyp_args.append('--generator-output=out') |
| 172 # -Goutput_dir defines where the build output goes, relative to the |
| 173 # Makefile. Set it to . so that the build output doesn't end up in out/out. |
| 174 gyp_args.append('-Goutput_dir=.') |
171 run_gyp(gyp_args) | 175 run_gyp(gyp_args) |
OLD | NEW |