Skip to content

Commit 3a5f602

Browse files
committed
Merge bitcoin/bitcoin#31171: depends: Specify CMake generator explicitly
e2ba823 depends: Specify CMake generator explicitly (Hennadii Stepanov) Pull request description: Building packages in depends implies using GNU Make. However, this assumption can be wrong in environments where the [`CMAKE_GENERATOR`](https://cmake.org/cmake/help/latest/envvar/CMAKE_GENERATOR.html) variable is set. This change explicitly makes CMake use the "Unix Makefiles" generator. Can be tested as follows: ``` $ env CMAKE_GENERATOR=Ninja make -C depends ``` ACKs for top commit: fanquake: ACK e2ba823 - Going forward I think we should look at making this work without having to hard code anything. Tree-SHA512: e14ed1cec192434fe089d36a83e1e150727a3b299fada80a61fa5b44b0c50e014a774ef1e6cd6df189e25f7a13042a20d4f9605f6ccd32e7782f10adaf5e788f
2 parents c9e67e2 + e2ba823 commit 3a5f602

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

depends/funcs.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
179179
CXX="$$($(1)_cxx)" \
180180
CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \
181181
LDFLAGS="$$($(1)_ldflags)" \
182-
cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \
182+
cmake -G "Unix Makefiles" \
183+
-DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \
183184
-DCMAKE_AR=`which $$($(1)_ar)` \
184185
-DCMAKE_NM=`which $$($(1)_nm)` \
185186
-DCMAKE_RANLIB=`which $$($(1)_ranlib)` \

0 commit comments

Comments
 (0)