From 2d89b4b14f098c39701e6e84929f8408c82a4281 Mon Sep 17 00:00:00 2001 From: Timothy J Fontaine Date: Wed, 17 Apr 2013 11:14:12 -0700 Subject: [PATCH] build: avoid double / in paths for dtrace GYP doesn't resolve or normalize the paths, resulting in the action not firing if the path contains // so take care to avoid that --- uv.gyp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/uv.gyp b/uv.gyp index 6f1de77b0f..1b843e407f 100644 --- a/uv.gyp +++ b/uv.gyp @@ -5,7 +5,8 @@ # this is only relevant when dtrace is enabled and libuv is a child project # as it's necessary to correctly locate the object files for post # processing. - 'uv_parent_path': '', + # XXX gyp is quite sensitive about paths with double / they don't normalize + 'uv_parent_path': '/', }, 'target_defaults': { @@ -475,10 +476,10 @@ 'action_name': 'uv_dtrace_o', 'inputs': [ 'src/unix/uv-dtrace.d', - '<(PRODUCT_DIR)/obj.target/libuv/<(uv_parent_path)/src/unix/core.o', + '<(PRODUCT_DIR)/obj.target/libuv<(uv_parent_path)src/unix/core.o', ], 'outputs': [ - '<(PRODUCT_DIR)/obj.target/libuv/<(uv_parent_path)/src/unix/dtrace.o', + '<(PRODUCT_DIR)/obj.target/libuv<(uv_parent_path)src/unix/dtrace.o', ], 'action': [ 'dtrace', '-G', '-xnolibs', '-s', '<@(_inputs)', '-o', '<@(_outputs)' ]