Don't compile in node_dtrace.cc when not supported

diff --git a/node.gyp b/node.gyp
index 3114c57..19fa54b 100644 (file)
--- a/node.gyp
+++ b/node.gyp
@@ -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',
           ],
         }],
 

diff --git a/src/node.cc b/src/node.cc
index 46d2a79..f846115 100644 (file)
--- a/src/node.cc
+++ b/src/node.cc
@@ -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>

diff --git a/wscript b/wscript
index 30d4501..b24db2c 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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 "