amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cppdap: Link with libatomic.

Browse source 
* gnu/packages/debug.scm (cppdap)[arguments]: Remove configure-flag
linking the executable with libatomic when building for riscv64-linux.
Add a phase to link with libatomic.

Change-Id: I16c899d921967caafa159d11d30d6c81a6d67729
This commit is contained in:
Efraim Flashner 2025-06-09 10:08:00 +03:00
parent a412385948
commit e8a3d363f4
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/debug.scm
View file

@ -220,10 +220,20 @@ tools that process C/C++ code.")
;; Only one of the following three can be enabled at the same time ;; Only one of the following three can be enabled at the same time
;; "-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=ON" ;; "-DCPPDAP_USE_EXTERNAL_RAPIDJSON_PACKAGE=ON"
;; "-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=ON" ;; "-DCPPDAP_USE_EXTERNAL_JSONCPP_PACKAGE=ON"
"-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON" "-DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON")
#$@(if (target-riscv64?) #:phases
'("-DCMAKE_EXE_LINKER_FLAGS=-latomic") (if (target-riscv64?)
'())))) #~(modify-phases %standard-phases
;; We need to unconditionally link with libatomic on some
;; architectures to successfully build cmake.
(add-after 'unpack 'link-with-libatomic
(lambda _
(substitute* "CMakeLists.txt"
(("cppdap_set_target_options\\(cppdap\\)" all)
(string-append
all "\n\n"
"target_link_libraries(cppdap PRIVATE atomic)"))))))
#~%standard-phases)))
(native-inputs (native-inputs
(list googletest)) (list googletest))
;; see lib/cmake/cppdap/cppdapConfig.cmake ;; see lib/cmake/cppdap/cppdapConfig.cmake