Revision: 8883 Author: [email protected] Date: Wed Aug 10 07:15:35 2011 Log: Merge revision 8880 from bleeding_edge
Fix cross-compilation for ARM TEST=Arm builder on Chromium waterfall successfully compiles Review URL: http://codereview.chromium.org/7590024 http://code.google.com/p/v8/source/detail?r=8883 Modified: /trunk/build/v8-features.gypi /trunk/src/version.cc /trunk/tools/gyp/v8.gyp ======================================= --- /trunk/build/v8-features.gypi Wed Aug 10 04:27:35 2011 +++ /trunk/build/v8-features.gypi Wed Aug 10 07:15:35 2011 @@ -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'], }], ======================================= --- /trunk/src/version.cc Wed Aug 10 04:27:35 2011 +++ /trunk/src/version.cc Wed Aug 10 07:15:35 2011 @@ -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 ======================================= --- /trunk/tools/gyp/v8.gyp Wed Aug 10 04:27:35 2011 +++ /trunk/tools/gyp/v8.gyp Wed Aug 10 07:15:35 2011 @@ -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
