Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: tools/gyp/v8.gyp

Issue 9808065: Add support for Mac OS X 64bit builds with GYP (Closed) Base URL: git://github.com/v8/v8.git@bleeding_edge
Patch Set: Fixed typo in commit message Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/gyp_v8 ('K') | « build/gyp_v8 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 764789a8f4252b7b372e63dc96279c694378d712..c0dbcd2f439d3e1c0ea6e16d602885aea1116784 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -59,6 +59,9 @@
'../../src/v8dll-main.cc',
],
'conditions': [
+ ['OS=="mac"', {
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']},
Jakob Kummerow 2012/03/28 16:08:51 80 cols per line, please.
fdmanana 2012/03/28 16:49:29 Ops, sorry :)
+ }],
['OS=="win"', {
'defines': [
'BUILDING_V8_SHARED',
@@ -536,7 +539,7 @@
'../../src/arm/stub-cache-arm.cc',
],
}],
- ['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
+ ['v8_target_arch=="ia32"', {
Jakob Kummerow 2012/03/28 16:08:51 From crbug.com/44205, I gather that it should be p
fdmanana 2012/03/28 16:49:29 Ok, I'll leave this as it was before. I found it w
'sources': [
'../../src/ia32/assembler-ia32-inl.h',
'../../src/ia32/assembler-ia32.cc',
@@ -601,7 +604,7 @@
'../../src/mips/stub-cache-mips.cc',
],
}],
- ['v8_target_arch=="x64" or v8_target_arch=="mac" or OS=="mac"', {
+ ['v8_target_arch=="x64"', {
'sources': [
'../../src/x64/assembler-x64-inl.h',
'../../src/x64/assembler-x64.cc',
« build/gyp_v8 ('K') | « build/gyp_v8 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698