Index: build/gyp_v8 |
diff --git a/build/gyp_v8 b/build/gyp_v8 |
index 0c2221e262395bc109a9d04c5d9ba1582f9f49e6..a5246f377065d1f01b9dc30a071f406a3ffb4d05 100755 |
--- a/build/gyp_v8 |
+++ b/build/gyp_v8 |
@@ -38,9 +38,13 @@ import sys |
script_dir = os.path.dirname(__file__) |
v8_root = os.path.normpath(os.path.join(script_dir, os.pardir)) |
+sys.path.insert(0, os.path.join(v8_root, 'tools')) |
+import utils |
+ |
sys.path.insert(0, os.path.join(v8_root, 'build', 'gyp', 'pylib')) |
import gyp |
+ |
def apply_gyp_environment(file_path=None): |
""" |
Reads in a *.gyp_env file and applies the valid keys to os.environ. |
@@ -68,6 +72,7 @@ def apply_gyp_environment(file_path=None): |
else: |
os.environ[var] = val |
+ |
def additional_include_files(args=[]): |
""" |
Returns a list of additional (.gypi) files to include, without |
@@ -97,6 +102,14 @@ def additional_include_files(args=[]): |
return result |
+ |
+def run_gyp(args): |
+ rc = gyp.main(args) |
+ if rc != 0: |
+ print 'Error running GYP' |
+ sys.exit(rc) |
+ |
+ |
if __name__ == '__main__': |
args = sys.argv[1:] |
@@ -131,6 +144,7 @@ if __name__ == '__main__': |
# Set the GYP DEPTH variable to the root of the V8 project. |
args.append('--depth=' + v8_root) |
+ #args.append('--depth=/usr/local/google/home/sgjesse/v8/xxx') |
Jakob Kummerow
2011/06/09 14:58:05
is this change intentional?
Søren Thygesen Gjesse
2011/06/09 15:11:42
Nope - removed.
|
# If V8_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check |
# to enfore syntax checking. |
@@ -141,5 +155,20 @@ if __name__ == '__main__': |
print 'Updating projects from gyp files...' |
sys.stdout.flush() |
- # Off we go... |
- sys.exit(gyp.main(args)) |
+ # Generate for the architectures supported on the given platform. |
+ gyp_args = list(args) |
+ gyp_args.append('-Dtarget_arch=ia32') |
+ if utils.GuessOS() == 'linux': |
+ gyp_args.append('-S-ia32') |
+ run_gyp(gyp_args) |
+ |
+ if utils.GuessOS() == 'linux': |
+ gyp_args = list(args) |
+ gyp_args.append('-Dtarget_arch=x64') |
+ gyp_args.append('-S-x64') |
+ run_gyp(gyp_args) |
+ |
+ gyp_args = list(args) |
+ gyp_args.append('-I' + v8_root + '/build/armu.gypi') |
+ gyp_args.append('-S-armu') |
+ run_gyp(gyp_args) |