Bug#19180531: UNABLE TO COMPILE MYSQL-TRUNK WITH DEBUG DUE TO

phulakun · phulakun · commit 2f9c789a49c5 · 2014-07-15T13:30:57.000+05:30
DTRACE PROBLEMS

Follow up patch. Adding compile definitions was resulting in build
break on some platforms. Reverting compile definitions appended
to CFLAGS.
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
@@ -121,11 +121,7 @@ FUNCTION(DTRACE_INSTRUMENT target)
       # dtrace on Linux runs gcc and uses flags from environment
       SET(CFLAGS_SAVED $ENV{CFLAGS})
       STRING(REGEX REPLACE "-W[A-Za-z0-9-]*" "" C_FLAGS "${CMAKE_C_FLAGS}")
-      GET_PROPERTY(compile_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
-      FOREACH( def ${compile_definitions} )
-        SET(COMP_DEFS "${COMP_DEFS} -D${def}")
-      ENDFOREACH()
-      SET(ENV{CFLAGS} "${C_FLAGS} ${COMP_DEFS}")
+      SET(ENV{CFLAGS} ${C_FLAGS})
       SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
       # Systemtap object
       EXECUTE_PROCESS(
