Skip to content

Commit

Permalink
build: use latest config.{guess,sub} in depends (#641)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
DeckerSU authored Nov 20, 2024
1 parent ecfe30c commit e40cd54
Show file tree
Hide file tree
Showing 6 changed files with 2,422 additions and 1,989 deletions.
32 changes: 16 additions & 16 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ baseline_filtered.info: baseline.info
else
baseline_filtered.info: baseline.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
Expand All @@ -209,10 +209,10 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
else
leveldb_baseline_filtered.info: leveldb_baseline.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
Expand Down Expand Up @@ -244,10 +244,10 @@ test_bitcoin_filtered.info: test_bitcoin.info
else
test_bitcoin_filtered.info: test_bitcoin.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
Expand Down Expand Up @@ -278,10 +278,10 @@ block_test_filtered.info: block_test.info
else
block_test_filtered.info: block_test.info
$(LCOV) -r $< "/usr/include/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
"$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
"$(abs_builddir)/src/gtest/*" \
"$(abs_builddir)/src/test/*" \
"$(abs_builddir)/src/wallet/gtest/*" \
Expand Down
2 changes: 1 addition & 1 deletion depends/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ install: check-packages $(host_prefix)/share/config.site
download-one: check-sources $(all_sources)

download-osx:
@$(MAKE) -s HOST=x86_64-apple-darwin11 download-one
@$(MAKE) -s HOST=x86_64-apple-darwin download-one
download-linux:
@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
download-win:
Expand Down
Loading

0 comments on commit e40cd54

Please sign in to comment.