1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't compile in node_dtrace.cc when not supported

Browse Source
This commit is contained in:
Ryan Dahl 2011-10-26 11:31:12 -07:00
parent 3961b5a131
commit b3ddb895d2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node.gyp
View File

@ -74,7 +74,6 @@
'src/node.cc', 'src/node.cc',
'src/node_buffer.cc', 'src/node_buffer.cc',
'src/node_constants.cc', 'src/node_constants.cc',
'src/node_dtrace.cc',
'src/node_extensions.cc', 'src/node_extensions.cc',
'src/node_file.cc', 'src/node_file.cc',
'src/node_http_parser.cc', 'src/node_http_parser.cc',
@ -98,7 +97,6 @@
'src/node_buffer.h', 'src/node_buffer.h',
'src/node_constants.h', 'src/node_constants.h',
'src/node_crypto.h', 'src/node_crypto.h',
'src/node_dtrace.h',
'src/node_extensions.h', 'src/node_extensions.h',
'src/node_file.h', 'src/node_file.h',
'src/node_http_parser.h', 'src/node_http_parser.h',
@ -142,7 +140,11 @@
[ 'node_use_dtrace=="true"', { [ 'node_use_dtrace=="true"', {
'sources': [ 'sources': [
'src/node_provider.h', # why does this get generated into src and not SHARED_INTERMEDIATE_DIR? 'src/node_dtrace.cc',
'src/node_dtrace.h',
# why does node_provider.h get generated into src and not
# SHARED_INTERMEDIATE_DIR?
'src/node_provider.h',
], ],
}], }],

2
src/node.cc
View File

@ -24,7 +24,9 @@
#include <uv.h> #include <uv.h>
#include <v8-debug.h> #include <v8-debug.h>
#ifdef HAVE_DTRACE
# include <node_dtrace.h> # include <node_dtrace.h>
#endif
#include <locale.h> #include <locale.h>
#include <signal.h> #include <signal.h>

3
wscript
View File

@ -903,6 +903,9 @@ def build(bld):
src/v8_typed_array.cc src/v8_typed_array.cc
""" """
if bld.env["USE_DTRACE"]:
node.source += " src/node_dtrace.cc "
if not sys.platform.startswith("win32"): if not sys.platform.startswith("win32"):
node.source += " src/node_signal_watcher.cc " node.source += " src/node_signal_watcher.cc "
node.source += " src/node_stat_watcher.cc " node.source += " src/node_stat_watcher.cc "