Revision: 8902 Author: [email protected] Date: Thu Aug 11 07:12:50 2011 Log: Merge revision 8899 from bleeding_edge
Third attempt to fix ARM cross-compile build Review URL: http://codereview.chromium.org/7617009 http://code.google.com/p/v8/source/detail?r=8902 Modified: /trunk/src/version.cc /trunk/tools/gyp/v8.gyp ======================================= --- /trunk/src/version.cc Thu Aug 11 05:34:10 2011 +++ /trunk/src/version.cc Thu Aug 11 07:12:50 2011 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 5 #define BUILD_NUMBER 4 -#define PATCH_LEVEL 2 +#define PATCH_LEVEL 3 // 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 Thu Aug 11 05:34:10 2011 +++ /trunk/tools/gyp/v8.gyp Thu Aug 11 07:12:50 2011 @@ -319,10 +319,13 @@ }], # The ARM assembler assumes the host is 32 bits, # so force building 32-bit host tools. - ['v8_target_arch=="arm" and host_arch=="x64" and \ - _toolset=="host"', { - 'cflags': ['-m32'], - 'ldflags': ['-m32'], + ['v8_target_arch=="arm" and host_arch=="x64"', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags': ['-m32'], + 'ldflags': ['-m32'], + }], + ], }], ['component=="shared_library"', { 'conditions': [ @@ -429,10 +432,13 @@ 'conditions': [ # The ARM assembler assumes the host is 32 bits, # so force building 32-bit host tools. - ['v8_target_arch=="arm" and host_arch=="x64" and \ - _toolset=="host"', { - 'cflags': ['-m32'], - 'ldflags': ['-m32'], + ['v8_target_arch=="arm" and host_arch=="x64"', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags': ['-m32'], + 'ldflags': ['-m32'], + }], + ], }], ['want_separate_host_toolset==1', { 'toolsets': ['host', 'target'], @@ -748,9 +754,13 @@ 'conditions': [ # The ARM assembler assumes the host is 32 bits, # so force building 32-bit host tools. - ['host_arch=="x64" and _toolset=="host"', { - 'cflags': ['-m32'], - 'ldflags': ['-m32'], + ['host_arch=="x64"', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags': ['-m32'], + 'ldflags': ['-m32'], + }], + ], }], ], }], @@ -993,10 +1003,13 @@ }], # The ARM assembler assumes the host is 32 bits, # so force building 32-bit host tools. - ['v8_target_arch=="arm" and host_arch=="x64" and \ - _toolset=="host"', { - 'cflags': ['-m32'], - 'ldflags': ['-m32'], + ['v8_target_arch=="arm" and host_arch=="x64"', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags': ['-m32'], + 'ldflags': ['-m32'], + }], + ], }], ['v8_compress_startup_data=="bz2"', { 'libraries': [ @@ -1065,10 +1078,13 @@ }], # The ARM assembler assumes the host is 32 bits, # so force building 32-bit host tools. - ['v8_target_arch=="arm" and host_arch=="x64" and \ - _toolset=="host"', { - 'cflags': ['-m32'], - 'ldflags': ['-m32'], + ['v8_target_arch=="arm" and host_arch=="x64"', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags': ['-m32'], + 'ldflags': ['-m32'], + }], + ], }], ], 'link_settings': { -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
