diff options
| -rw-r--r-- | src/pal/src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/scripts/genLttngProvider.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index dbff63dc00..130e06ed4b 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 2.8.12.2) -if(CMAKE_SYSTEM_NAME STREQUAL Darwin) - # On OSX, we use the libunwind that's part of the OS +if(CMAKE_SYSTEM_NAME STREQUAL Darwin OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + # On OSX and *BSD, we use the libunwind that's part of the OS set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1) -endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) +endif(CMAKE_SYSTEM_NAME STREQUAL Darwin OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) include_directories(SYSTEM /usr/local/include) diff --git a/src/scripts/genLttngProvider.py b/src/scripts/genLttngProvider.py index de537d0f1a..296042be5b 100644 --- a/src/scripts/genLttngProvider.py +++ b/src/scripts/genLttngProvider.py @@ -555,8 +555,10 @@ def generateLttngFiles(etwmanifest,eventprovider_directory): tracepointprovider_Cmake.write(""" ) + find_library(LTTNG NAMES lttng-ust) + target_link_libraries(coreclrtraceptprovider - -llttng-ust + ${LTTNG} ) # Install the static coreclrtraceptprovider library @@ -772,4 +774,4 @@ def main(argv): if __name__ == '__main__': return_code = main(sys.argv[1:]) - sys.exit(return_code)
\ No newline at end of file + sys.exit(return_code) |