Permalink
Browse files

Don't compile in node_dtrace.cc when not supported

  • Loading branch information...
1 parent 3961b5a commit b3ddb895d2e3dc983d6f40dc95179dc7eda3440e @ry ry committed Oct 26, 2011
Showing with 11 additions and 4 deletions.
  1. +5 −3 node.gyp
  2. +3 −1 src/node.cc
  3. +3 −0 wscript
View
@@ -74,7 +74,6 @@
'src/node.cc',
'src/node_buffer.cc',
'src/node_constants.cc',
- 'src/node_dtrace.cc',
'src/node_extensions.cc',
'src/node_file.cc',
'src/node_http_parser.cc',
@@ -98,7 +97,6 @@
'src/node_buffer.h',
'src/node_constants.h',
'src/node_crypto.h',
- 'src/node_dtrace.h',
'src/node_extensions.h',
'src/node_file.h',
'src/node_http_parser.h',
@@ -142,7 +140,11 @@
[ 'node_use_dtrace=="true"', {
'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',
],
}],
View
@@ -24,7 +24,9 @@
#include <uv.h>
#include <v8-debug.h>
-#include <node_dtrace.h>
+#ifdef HAVE_DTRACE
+# include <node_dtrace.h>
+#endif
#include <locale.h>
#include <signal.h>
View
@@ -903,6 +903,9 @@ def build(bld):
src/v8_typed_array.cc
"""
+ if bld.env["USE_DTRACE"]:
+ node.source += " src/node_dtrace.cc "
+
if not sys.platform.startswith("win32"):
node.source += " src/node_signal_watcher.cc "
node.source += " src/node_stat_watcher.cc "

0 comments on commit b3ddb89

Please sign in to comment.