Skip to content

Commit 78ab523

Browse files
committed
Build: Minor bug fixes
* make should always be called as $(MAKE) in makefiles * CMake didn't keep job server fds open when explicilty specifying the build command. Starting with CMAKE 3.28 there is a new option to allow for that, but we support much older cmakes than that. (BUILD_JOB_SERVER_AWARE). Not sure when this broke in practice, might have been with some update of Make/CMake or wally. (concurrent builds (-j8) doesn't work right now)
1 parent 821a48f commit 78ab523

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ generate-atecc608-config:
150150
ci:
151151
./.ci/ci
152152
prepare-tidy: | build build-build
153-
make -C build rust-cbindgen
154-
make -C build-build rust-cbindgen
153+
$(MAKE) -C build rust-cbindgen
154+
$(MAKE) -C build-build rust-cbindgen
155155
clean:
156156
rm -rf build build-build build-debug build-build-rust-unit-tests

external/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ ExternalProject_Add(libwally-core
5555
${CMAKE_CURRENT_SOURCE_DIR}/libwally-core/configure
5656
${CONFIGURE_FLAGS}
5757
${LIBWALLY_CONFIGURE_FLAGS}
58-
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
5958
INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
6059
COMMAND ${CMAKE_COMMAND} -E copy
6160
${CMAKE_CURRENT_BINARY_DIR}/libwally-core/src/libwally-core-build/src/.libs/libwallycore.a

0 commit comments

Comments
 (0)