Skip to content

Commit 7fcf4e9

Browse files
committed
Merge bitcoin#30078: depends: set AR & RANLIB for CMake
019ad73 depends: set RANLIB for CMake (fanquake) 43cfb42 depends: set NM for CMake (fanquake) 1e4412b depends: set AR for CMake (fanquake) Pull request description: Needed for bitcoin#21778. Should be more correct in any case. ACKs for top commit: theuni: utACK 019ad73. I didn't test, but I tried this approach on a few deps and it seemed to work as expected. TheCharlatan: ACK 019ad73 Tree-SHA512: 78cc8981456f7476cafca0e40fcc569e474b92004c8024d1c4268b6aab53175074a06ab17ebded8d706bf0a7f77401642dd38bb7ce2e4b04abdcd149d3d69969
2 parents d6069cb + 019ad73 commit 7fcf4e9

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

depends/funcs.mk

+3
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
180180
CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \
181181
LDFLAGS="$$($(1)_ldflags)" \
182182
cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" \
183+
-DCMAKE_AR=`which $$($(1)_ar)` \
184+
-DCMAKE_NM=`which $$($(1)_nm)` \
185+
-DCMAKE_RANLIB=`which $$($(1)_ranlib)` \
183186
-DCMAKE_INSTALL_LIBDIR=lib/ \
184187
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
185188
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(V) \

0 commit comments

Comments
 (0)