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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/gyp/v8.gyp

Issue 7396022: Revert "Make GYP build usable for day-to-day work" (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years, 5 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
« no previous file with comments | « test/preparser/testcfg.py ('k') | tools/test.py » ('j') | 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 98086cc9599ee8a1871269553647526b76ee2f87..26504836afddad8b8b879557fded77a8b08bd026 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -61,6 +61,9 @@
'conditions': [
['use_system_v8==0', {
'target_defaults': {
+ 'defines': [
+ 'ENABLE_DEBUGGER_SUPPORT',
+ ],
'conditions': [
['OS!="mac"', {
# TODO(mark): The OS!="mac" conditional is temporary. It can be
@@ -94,19 +97,6 @@
'USE_EABI_HARDFLOAT=1',
'CAN_USE_VFP_INSTRUCTIONS',
],
- 'cflags': [
- '-mfloat-abi=hard',
- ],
- }, {
- 'defines': [
- 'USE_EABI_HARDFLOAT=0',
- ],
- }],
- # The ARM assembler assumes the host is 32 bits,
- # so force building 32-bit host tools.
- [ 'host_arch=="x64"', {
- 'cflags': ['-m32'],
- 'ldflags': ['-m32'],
}],
],
}],
@@ -165,10 +155,6 @@
['OS=="freebsd" or OS=="openbsd"', {
'cflags': [ '-I/usr/local/include' ],
}],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
- 'cflags': [ '-Wall', '-Werror', '-W', '-Wno-unused-parameter',
- '-Wnon-virtual-dtor' ],
- }],
],
},
'Release': {
@@ -178,6 +164,10 @@
'-O2',
'-Os',
],
+ 'cflags': [
+ '-fomit-frame-pointer',
+ '-O3',
+ ],
'conditions': [
[ 'gcc_version==44', {
'cflags': [
@@ -239,12 +229,8 @@
'targets': [
{
'target_name': 'v8',
+ 'toolsets': ['host', 'target'],
'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host', 'target'],
- }, {
- 'toolsets': ['target'],
- }],
['v8_use_snapshot=="true"', {
'dependencies': ['v8_snapshot'],
},
@@ -284,20 +270,25 @@
'type': 'none',
}],
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../../include',
+ ],
+ },
},
{
'target_name': 'v8_snapshot',
'type': '<(library)',
+ 'toolsets': ['host', 'target'],
'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host', 'target'],
- 'dependencies': ['mksnapshot#host', 'js2c#host'],
- }, {
- 'toolsets': ['target'],
- 'dependencies': ['mksnapshot', 'js2c'],
- }],
['component=="shared_library"', {
'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'],
+ }],
['OS=="win"', {
'defines': [
'BUILDING_V8_SHARED',
@@ -321,6 +312,8 @@
}],
],
'dependencies': [
+ 'mksnapshot#host',
+ 'js2c#host',
'v8_base',
],
'include_dirs+': [
@@ -387,7 +380,9 @@
{
'target_name': 'v8_nosnapshot',
'type': '<(library)',
+ 'toolsets': ['host', 'target'],
'dependencies': [
+ 'js2c#host',
'v8_base',
],
'include_dirs+': [
@@ -399,12 +394,11 @@
'../../src/snapshot-empty.cc',
],
'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host', 'target'],
- 'dependencies': ['js2c#host'],
- }, {
- 'toolsets': ['target'],
- 'dependencies': ['js2c'],
+ # 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'],
}],
['component=="shared_library"', {
'defines': [
@@ -417,6 +411,7 @@
{
'target_name': 'v8_base',
'type': '<(library)',
+ 'toolsets': ['host', 'target'],
'include_dirs+': [
'../../src',
],
@@ -671,12 +666,10 @@
'../../src/extensions/gc-extension.h',
],
'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host', 'target'],
- }, {
- 'toolsets': ['target'],
- }],
['v8_target_arch=="arm"', {
+ 'include_dirs+': [
+ '../../src/arm',
+ ],
'sources': [
'../../src/arm/assembler-arm-inl.h',
'../../src/arm/assembler-arm.cc',
@@ -709,8 +702,19 @@
'../../src/arm/simulator-arm.cc',
'../../src/arm/stub-cache-arm.cc',
],
+ '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'],
+ }]
+ ]
}],
['v8_target_arch=="ia32" or v8_target_arch=="mac" or OS=="mac"', {
+ 'include_dirs+': [
+ '../../src/ia32',
+ ],
'sources': [
'../../src/ia32/assembler-ia32-inl.h',
'../../src/ia32/assembler-ia32.cc',
@@ -742,6 +746,9 @@
],
}],
['v8_target_arch=="x64" or v8_target_arch=="mac" or OS=="mac"', {
+ 'include_dirs+': [
+ '../../src/x64',
+ ],
'sources': [
'../../src/x64/assembler-x64-inl.h',
'../../src/x64/assembler-x64.cc',
@@ -774,6 +781,10 @@
}],
['OS=="linux"', {
'link_settings': {
+ 'libraries': [
+ # Needed for clock_gettime() used by src/platform-linux.cc.
+ '-lrt',
+ ],
'conditions': [
['v8_compress_startup_data=="bz2"', {
'libraries': [
@@ -859,13 +870,7 @@
{
'target_name': 'js2c',
'type': 'none',
- 'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host'],
- }, {
- 'toolsets': ['target'],
- }],
- ],
+ 'toolsets': ['host'],
'variables': {
'library_files': [
'../../src/runtime.js',
@@ -931,6 +936,7 @@
{
'target_name': 'mksnapshot',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'v8_nosnapshot',
],
@@ -941,10 +947,11 @@
'../../src/mksnapshot.cc',
],
'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host'],
- }, {
- 'toolsets': ['target'],
+ # 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_compress_startup_data=="bz2"', {
'libraries': [
@@ -955,6 +962,7 @@
{
'target_name': 'v8_shell',
'type': 'executable',
+ 'toolsets': ['host'],
'dependencies': [
'v8'
],
@@ -962,57 +970,29 @@
'../../samples/shell.cc',
],
'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host'],
- }, {
- 'toolsets': ['target'],
- }],
['OS=="win"', {
# This could be gotten by not setting chromium_code, if that's OK.
'defines': ['_CRT_SECURE_NO_WARNINGS'],
}],
+ # 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_compress_startup_data=="bz2"', {
'libraries': [
'-lbz2',
]}],
],
},
- {
- 'target_name': 'preparser_lib',
- 'type': '<(library)',
- 'include_dirs+': [
- '../../src',
- ],
- 'sources': [
- '../../src/allocation.cc',
- '../../src/bignum.cc',
- '../../src/cached-powers.cc',
- '../../src/conversions.cc',
- '../../src/hashmap.cc',
- '../../src/preparse-data.cc',
- '../../src/preparser.cc',
- '../../src/preparser-api.cc',
- '../../src/scanner-base.cc',
- '../../src/strtod.cc',
- '../../src/token.cc',
- '../../src/unicode.cc',
- '../../src/utils.cc',
- ],
- },
],
}, { # use_system_v8 != 0
'targets': [
{
'target_name': 'v8',
'type': 'settings',
- 'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host', 'target'],
- }, {
- 'toolsets': ['target'],
- }],
-
- ],
+ 'toolsets': ['host', 'target'],
'link_settings': {
'libraries': [
'-lv8',
@@ -1022,13 +1002,7 @@
{
'target_name': 'v8_shell',
'type': 'none',
- 'conditions': [
- ['want_separate_host_toolset==1', {
- 'toolsets': ['host'],
- }, {
- 'toolsets': ['target'],
- }],
- ],
+ 'toolsets': ['host'],
'dependencies': [
'v8'
],
« no previous file with comments | « test/preparser/testcfg.py ('k') | tools/test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698