Skip to content

Commit e40cd54

Browse files
authored
build: use latest config.{guess,sub} in depends (#641)
Been a few years since we last updated these. - bitcoin/bitcoin#27508 - #636 - DeckerSU/KomodoOcean#84 Taking into account that the `x86_64-unknown-linux-gnu` triplet has been changed to `x86_64-pc-linux-gnu` with the new files.
1 parent ecfe30c commit e40cd54

File tree

6 files changed

+2422
-1989
lines changed

6 files changed

+2422
-1989
lines changed

Makefile.am

+16-16
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ baseline_filtered.info: baseline.info
180180
else
181181
baseline_filtered.info: baseline.info
182182
$(LCOV) -r $< "/usr/include/*" \
183-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
184-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
185-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
186-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
183+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
184+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
185+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
186+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
187187
"$(abs_builddir)/src/gtest/*" \
188188
"$(abs_builddir)/src/test/*" \
189189
"$(abs_builddir)/src/wallet/gtest/*" \
@@ -209,10 +209,10 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
209209
else
210210
leveldb_baseline_filtered.info: leveldb_baseline.info
211211
$(LCOV) -r $< "/usr/include/*" \
212-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
213-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
214-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
215-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
212+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
213+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
214+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
215+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
216216
"$(abs_builddir)/src/gtest/*" \
217217
"$(abs_builddir)/src/test/*" \
218218
"$(abs_builddir)/src/wallet/gtest/*" \
@@ -244,10 +244,10 @@ test_bitcoin_filtered.info: test_bitcoin.info
244244
else
245245
test_bitcoin_filtered.info: test_bitcoin.info
246246
$(LCOV) -r $< "/usr/include/*" \
247-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
248-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
249-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
250-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
247+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
248+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
249+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
250+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
251251
"$(abs_builddir)/src/gtest/*" \
252252
"$(abs_builddir)/src/test/*" \
253253
"$(abs_builddir)/src/wallet/gtest/*" \
@@ -278,10 +278,10 @@ block_test_filtered.info: block_test.info
278278
else
279279
block_test_filtered.info: block_test.info
280280
$(LCOV) -r $< "/usr/include/*" \
281-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
282-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
283-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
284-
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
281+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
282+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
283+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
284+
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
285285
"$(abs_builddir)/src/gtest/*" \
286286
"$(abs_builddir)/src/test/*" \
287287
"$(abs_builddir)/src/wallet/gtest/*" \

depends/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ install: check-packages $(host_prefix)/share/config.site
147147
download-one: check-sources $(all_sources)
148148

149149
download-osx:
150-
@$(MAKE) -s HOST=x86_64-apple-darwin11 download-one
150+
@$(MAKE) -s HOST=x86_64-apple-darwin download-one
151151
download-linux:
152152
@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
153153
download-win:

0 commit comments

Comments
 (0)