Merge pull request #1361 from NickeZ/nickez/minor-build-fixes

Build: Minor bug fixes

Author: NickeZ

Makefile

@@ -150,7 +150,7 @@ generate-atecc608-config:
 ci:
 	./.ci/ci
 prepare-tidy: | build build-build
-	make -C build rust-cbindgen
-	make -C build-build rust-cbindgen
+	$(MAKE) -C build rust-cbindgen
+	$(MAKE) -C build-build rust-cbindgen
 clean:
 	rm -rf build build-build build-debug build-build-rust-unit-tests

external/CMakeLists.txt

@@ -55,7 +55,6 @@ ExternalProject_Add(libwally-core
                   ${CMAKE_CURRENT_SOURCE_DIR}/libwally-core/configure
                   ${CONFIGURE_FLAGS}
                   ${LIBWALLY_CONFIGURE_FLAGS}
-  BUILD_COMMAND   ${CMAKE_MAKE_PROGRAM}
   INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
   COMMAND         ${CMAKE_COMMAND} -E copy
                   ${CMAKE_CURRENT_BINARY_DIR}/libwally-core/src/libwally-core-build/src/.libs/libwallycore.a