mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-08 14:34:53 -05:00
Merge bitcoin/bitcoin#31171: depends: Specify CMake generator explicitly
e2ba823671
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: ACKe2ba823671
- Going forward I think we should look at making this work without having to hard code anything. Tree-SHA512: e14ed1cec192434fe089d36a83e1e150727a3b299fada80a61fa5b44b0c50e014a774ef1e6cd6df189e25f7a13042a20d4f9605f6ccd32e7782f10adaf5e788f
This commit is contained in:
commit
3a5f6027e1
1 changed files with 2 additions and 1 deletions
|
@ -179,7 +179,8 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
|
|||
CXX="$$($(1)_cxx)" \
|
||||
CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \
|
||||
LDFLAGS="$$($(1)_ldflags)" \
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \
|
||||
cmake -G "Unix Makefiles" \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \
|
||||
-DCMAKE_AR=`which $$($(1)_ar)` \
|
||||
-DCMAKE_NM=`which $$($(1)_nm)` \
|
||||
-DCMAKE_RANLIB=`which $$($(1)_ranlib)` \
|
||||
|
|
Loading…
Add table
Reference in a new issue