Skip to content

Commit 6f6d262

Browse files
committed
cmake, doc: Update depends/README.md
1 parent 9ca2ee1 commit 6f6d262

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

depends/README.md

+5-9
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ For example:
1212

1313
make HOST=x86_64-w64-mingw32 -j4
1414

15-
**Bitcoin Core's `configure` script by default will ignore the depends output.** In
15+
**When configuring Bitcoin Core, CMake by default will ignore the depends output.** In
1616
order for it to pick up libraries, tools, and settings from the depends build,
17-
you must set the `CONFIG_SITE` environment variable to point to a `config.site` settings file.
18-
Make sure that `CONFIG_SITE` is an absolute path.
19-
In the above example, a file named `depends/x86_64-w64-mingw32/share/config.site` will be
20-
created. To use it during compilation:
17+
you must specify the toolchain file.
18+
In the above example, a file named `depends/x86_64-w64-mingw32/toolchain.cmake` will be
19+
created. To use it during configuring Bitcoin Core:
2120

22-
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure
23-
24-
The default install prefix when using `config.site` is `--prefix=depends/<host-platform-triplet>`,
25-
so depends build outputs will be installed in that location.
21+
cmake -B build --toolchain depends/x86_64-w64-mingw32/toolchain.cmake
2622

2723
Common `host-platform-triplet`s for cross compilation are:
2824

depends/funcs.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ $(1)_autoconf += LDFLAGS="$$($(1)_ldflags)"
171171
endif
172172

173173
# We hardcode the library install path to "lib" to match the PKG_CONFIG_PATH
174-
# setting in depends/config.site.in, which also hardcodes "lib".
174+
# setting in depends/toolchain.cmake.in, which also hardcodes "lib".
175175
# Without this setting, CMake by default would use the OS library
176176
# directory, which might be "lib64" or something else, not "lib", on multiarch systems.
177177
$(1)_cmake=env CC="$$($(1)_cc)" \

0 commit comments

Comments
 (0)