diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-29 16:18:40 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-08-29 16:18:47 +0200 |
| commit | 89de1538ce1f8c00f80e8d11f43e1b77e24d7dea (patch) | |
| tree | 2e5275e15d711db01070b9426b3b74b19cf74840 | |
| parent | de07fdcf77e97b8613091285e4d0a734f5de7492 (diff) | |
| parent | fae6bb85cf71056aa2541d9bc5cce26946a56945 (diff) | |
Merge #8624: [doc] build: Mention curl
fae6bb8 [doc] build: Mention curl (MarcoFalke)
| -rw-r--r-- | doc/build-unix.md | 5 | ||||
| -rw-r--r-- | doc/build-windows.md | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/build-unix.md b/doc/build-unix.md index bd89978cc2..62e3e793e9 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -293,9 +293,10 @@ These steps can be performed on, for example, an Ubuntu VM. The depends system will also work on other Linux distributions, however the commands for installing the toolchain will be different. -First install the toolchain: +Make sure you install the build requirements mentioned above. +Then, install the toolchain and curl: - sudo apt-get install g++-arm-linux-gnueabihf + sudo apt-get install g++-arm-linux-gnueabihf curl To build executables for ARM: diff --git a/doc/build-windows.md b/doc/build-windows.md index 2b9233d1e1..129774491b 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -16,9 +16,11 @@ These steps can be performed on, for example, an Ubuntu VM. The depends system will also work on other Linux distributions, however the commands for installing the toolchain will be different. -First install the toolchains: +Make sure you install the build requirements mentioned in +[build-unix.md](/doc/build-unix.md). +Then, install the toolchains and curl: - sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64 mingw-w64-x86-64-dev + sudo apt-get install g++-mingw-w64-i686 mingw-w64-i686-dev g++-mingw-w64-x86-64 mingw-w64-x86-64-dev curl To build executables for Windows 32-bit: |