Revision: 10057 Author: jkumme...@chromium.org Date: Wed Nov 23 09:32:34 2011 Log: Upstream Android V8 change.
Fix the Mac build. "_toolset" needs to be tested inside target_conditions now.
And there is no need to have -llog any more. Review URL: http://codereview.chromium.org/8631012 Patch from Jing Zhao <jingz...@chromium.org>. http://code.google.com/p/v8/source/detail?r=10057 Modified: /branches/bleeding_edge/build/common.gypi /branches/bleeding_edge/tools/gyp/v8.gyp ======================================= --- /branches/bleeding_edge/build/common.gypi Wed Nov 9 07:31:54 2011 +++ /branches/bleeding_edge/build/common.gypi Wed Nov 23 09:32:34 2011 @@ -141,7 +141,7 @@ }], # The ARM assembler assumes the host is 32 bits, # so force building 32-bit host tools. - ['host_arch=="x64"', { + ['host_arch=="x64" or OS=="android"', { 'target_conditions': [ ['_toolset=="host"', { 'cflags': ['-m32'], ======================================= --- /branches/bleeding_edge/tools/gyp/v8.gyp Wed Nov 9 07:31:54 2011 +++ /branches/bleeding_edge/tools/gyp/v8.gyp Wed Nov 23 09:32:34 2011 @@ -27,15 +27,6 @@ { 'includes': ['../../build/common.gypi'], - 'target_conditions': [ - ['OS=="android" and _toolset=="target"', { - 'link_settings': { - 'libraries': [ - '-llog', - ], - } - }], - ], 'conditions': [ ['use_system_v8==0', { 'targets': [ @@ -648,10 +639,18 @@ '../../src/platform-posix.cc', ], 'conditions': [ - ['host_os=="mac" and _toolset!="target"', { - 'sources': [ - '../../src/platform-macos.cc' - ] + ['host_os=="mac"', { + 'target_conditions': [ + ['_toolset=="host"', { + 'sources': [ + '../../src/platform-macos.cc' + ] + }, { + 'sources': [ + '../../src/platform-linux.cc' + ] + }], + ], }, { 'sources': [ '../../src/platform-linux.cc' -- v8-dev mailing list v8-dev@googlegroups.com http://groups.google.com/group/v8-dev
