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

Unified Diff: tools/gyp/v8.gyp

Issue 23710002: Revert "Cross-compiling from Linux to Android requires -lrt for the host toolset.", "Fix Visual Stu… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 4 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/cctest/test-time.cc ('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 708defed9bea6bfbd35f53b4c2722b619426d671..eefd142b7042040d7b6f298e37b8e4eeff57e0ac 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -436,9 +436,6 @@
'../../src/optimizing-compiler-thread.cc',
'../../src/parser.cc',
'../../src/parser.h',
- '../../src/platform/elapsed-timer.h',
- '../../src/platform/time.cc',
- '../../src/platform/time.h',
'../../src/platform-posix.h',
'../../src/platform.h',
'../../src/preparse-data-format.h',
@@ -691,9 +688,6 @@
]
}],
],
- 'libraries': [
- '-lrt'
- ]
},
'sources': [ ### gcmole(os:linux) ###
'../../src/platform-linux.cc',
@@ -706,7 +700,7 @@
'CAN_USE_VFP_INSTRUCTIONS',
],
'sources': [
- '../../src/platform-posix.cc'
+ '../../src/platform-posix.cc',
],
'conditions': [
['host_os=="mac"', {
@@ -722,15 +716,6 @@
}],
],
}, {
- 'link_settings': {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'libraries': [
- '-lrt'
- ]
- }]
- ]
- },
'sources': [
'../../src/platform-linux.cc'
]
@@ -778,7 +763,7 @@
]},
'sources': [
'../../src/platform-solaris.cc',
- '../../src/platform-posix.cc'
+ '../../src/platform-posix.cc',
],
}
],
@@ -801,13 +786,13 @@
['build_env=="Cygwin"', {
'sources': [
'../../src/platform-cygwin.cc',
- '../../src/platform-posix.cc'
+ '../../src/platform-posix.cc',
],
}, {
'sources': [
'../../src/platform-win32.cc',
+ '../../src/win32-math.h',
'../../src/win32-math.cc',
- '../../src/win32-math.h'
],
}],
],
@@ -817,8 +802,8 @@
}, {
'sources': [
'../../src/platform-win32.cc',
+ '../../src/win32-math.h',
'../../src/win32-math.cc',
- '../../src/win32-math.h'
],
'msvs_disabled_warnings': [4351, 4355, 4800],
'link_settings': {
« no previous file with comments | « test/cctest/test-time.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698