diff --git a/cmake/module/Maintenance.cmake b/cmake/module/Maintenance.cmake index 3f253b5aae335..9abf4990768c1 100644 --- a/cmake/module/Maintenance.cmake +++ b/cmake/module/Maintenance.cmake @@ -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. diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 2be4bb93e79f5..e86bcb3496920 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -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"} \ diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in index 7193c172868a1..a5354d31abacf 100644 --- a/depends/toolchain.cmake.in +++ b/depends/toolchain.cmake.in @@ -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)