Skip to content

Commit

Permalink
Merge #88: cmake: Add bitcoin-qt to Guix scripts
Browse files Browse the repository at this point in the history
6ed7dd1 fixup! cmake: Migrate Guix build scripts to CMake (Hennadii Stepanov)
fe20cc0 fixup! cmake: Add `Maintenance` module (Hennadii Stepanov)
f18ec5b fixup! build: Generate `share/toolchain.cmake` in depends (Hennadii Stepanov)

Pull request description:

  Resolves the #86 (review).

ACKs for top commit:
  TheCharlatan:
    ACK 6ed7dd1

Tree-SHA512: f586dfd596ced98e28b4d152f28a05ce722805e3565782b024d665d4a43155cc77ea392063b6c27916b64993aca7141d723e773de314a72149023ea6187b8597
  • Loading branch information
hebasto committed Feb 1, 2024
2 parents 1f41cc3 + 6ed7dd1 commit 5ccc4c8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmake/module/Maintenance.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function(add_maintenance_targets)
VERBATIM
)

foreach(target IN ITEMS bitcoind bitcoin-cli bitcoin-tx bitcoin-util bitcoin-wallet test_bitcoin bench_bitcoin)
foreach(target IN ITEMS bitcoind bitcoin-qt bitcoin-cli bitcoin-tx bitcoin-util bitcoin-wallet test_bitcoin bench_bitcoin)
if(TARGET ${target})
# Not using the TARGET_FILE generator expression because it creates excessive
# target-level dependencies in the following custom targets.
Expand Down
2 changes: 0 additions & 2 deletions contrib/guix/libexec/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ esac
####################

# Build the depends tree, overriding variables that assume multilib gcc
# TODO: Drop NO_QT=1
make -C depends --jobs="$JOBS" HOST="$HOST" \
NO_QT=1 \
${V:+V=1} \
${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
Expand Down
4 changes: 4 additions & 0 deletions depends/toolchain.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ set(CMAKE_OBJCOPY "@OBJCOPY@")
set(CMAKE_INSTALL_NAME_TOOL "@INSTALL_NAME_TOOL@")
set(OTOOL "@OTOOL@")

# Using our own built dependencies should not be
# affected by a potentially random environment.
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)

set(CMAKE_FIND_ROOT_PATH "@depends_prefix@")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
Expand Down

0 comments on commit 5ccc4c8

Please sign in to comment.