Skip to content

Commit 12c7945

Browse files
author
Vladislav Vaintroub
committed
correctly specify working directory for dtrace_prelink. Also, generate _dtrace.o in the object directory
1 parent 3d6465d commit 12c7945

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/dtrace.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ MACRO (DTRACE_INSTRUMENT target)
7474
# link it together with target.
7575
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
7676
SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
77-
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${target}_dtrace.o)
77+
SET(outfile ${objdir}/${target}_dtrace.o)
7878

7979
ADD_CUSTOM_COMMAND(
8080
TARGET ${target} PRE_LINK
@@ -84,7 +84,7 @@ MACRO (DTRACE_INSTRUMENT target)
8484
-DDFILE=${CMAKE_BINARY_DIR}/include/probes_mysql.d
8585
-DDTRACE_FLAGS=${DTRACE_FLAGS}
8686
-P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
87-
WORKING_DIRECTORY ${OBJDIR}
87+
WORKING_DIRECTORY ${objdir}
8888
)
8989
SET_TARGET_PROPERTIES(${target} PROPERTIES LINK_FLAGS "${outfile}")
9090
ENDIF()

0 commit comments

Comments
 (0)