646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
diff --git a/cmake_modules/FindOTF2.cmake b/cmake_modules/FindOTF2.cmake
|
|
index 2853f92a..af1f3225 100644
|
|
--- a/cmake_modules/FindOTF2.cmake
|
|
+++ b/cmake_modules/FindOTF2.cmake
|
|
@@ -15,11 +15,11 @@ IF(NOT OTF2_CONFIG OR NOT EXISTS ${OTF2_CONFIG})
|
|
ELSE()
|
|
message(STATUS "OTF2 installation found. (using ${OTF2_CONFIG})")
|
|
|
|
- execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" OUTPUT_VARIABLE OTF2_INCLUDE_PATH)
|
|
+ execute_process(COMMAND ${OTF2_CONFIG} "--cppflags" "--target" "backend" OUTPUT_VARIABLE OTF2_INCLUDE_PATH)
|
|
STRING(REPLACE "\n" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH})
|
|
STRING(REPLACE "-I" "" OTF2_INCLUDE_PATH ${OTF2_INCLUDE_PATH})
|
|
|
|
- execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" OUTPUT_VARIABLE _LINK_LD_ARGS)
|
|
+ execute_process(COMMAND ${OTF2_CONFIG} "--ldflags" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS)
|
|
STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
|
|
FOREACH( _ARG ${_LINK_LD_ARGS} )
|
|
IF(${_ARG} MATCHES "^-L")
|
|
@@ -29,7 +29,7 @@ ELSE()
|
|
ENDIF(${_ARG} MATCHES "^-L")
|
|
ENDFOREACH(_ARG)
|
|
|
|
- execute_process(COMMAND ${OTF2_CONFIG} "--libs" OUTPUT_VARIABLE _LINK_LD_ARGS)
|
|
+ execute_process(COMMAND ${OTF2_CONFIG} "--libs" "--target" "backend" OUTPUT_VARIABLE _LINK_LD_ARGS)
|
|
STRING( REPLACE " " ";" _LINK_LD_ARGS ${_LINK_LD_ARGS} )
|
|
FOREACH( _ARG ${_LINK_LD_ARGS} )
|
|
IF(${_ARG} MATCHES "^-l")
|