Reviewers: ,
Message:
Kevin LGTM'ed this offline.
Description:
Merge revision 8880 from bleeding_edge
Fix cross-compilation for ARM
TEST=Arm builder on Chromium waterfall successfully compiles
Committed: http://code.google.com/p/v8/source/detail?r=8883
Please review this at http://codereview.chromium.org/7590024/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M build/v8-features.gypi
M src/version.cc
M tools/gyp/v8.gyp
Index: build/v8-features.gypi
diff --git a/build/v8-features.gypi b/build/v8-features.gypi
index
cb9b61ce93e69a57cf66cc0c2259e88522e0d65d..099c8f429dff7e9a38d0e14b948d37ba20a0f455
100644
--- a/build/v8-features.gypi
+++ b/build/v8-features.gypi
@@ -99,7 +99,7 @@
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
- [ 'host_arch=="x64"', {
+ [ 'host_arch=="x64" and _toolset=="host "', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
42bb2feed4cfd00ab8b7bf8a9362ff6d4f11f0f4..c96abaf9845f18455ed10a57d90d0c2bf9e090d7
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 5
#define BUILD_NUMBER 4
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index
c802e86f95ae0b021c08eb12e16540cee16b0311..d176b93195605fec65d1b19559013121c1115d46
100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -114,7 +114,7 @@
}],
# The ARM assembler assumes the host is 32 bits,
# so force building 32-bit host tools.
- [ 'host_arch=="x64"', {
+ [ 'host_arch=="x64" and _toolset=="host"', {
'cflags': ['-m32'],
'ldflags': ['-m32'],
}],
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
