diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-23 17:11:39 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-23 17:13:15 +0100 |
| commit | 28b8061d9f1c0a44bf3dff4d47f01187e861b1b0 (patch) | |
| tree | d46c115a5c08b8fae7860d474d480ae0864588f7 | |
| parent | 8c33961313d9a6fd9e6e14f136057468a929b3e1 (diff) | |
| parent | ac91ea64c2b1daec8fee0bfde443c18cf87595ae (diff) | |
| download | bitcoin-28b8061d9f1c0a44bf3dff4d47f01187e861b1b0.tar.xz | |
Merge #12474: [depends] Allow depends system to support armv7l
ac91ea6 [depends] Allow depends system to support armv7l (Henrik Jonsson)
Pull request description:
Credit for the actual patches goes to @theuni, I just tested them on an armv7l machine.
This change allows the depends system to build our dependencies on 32-bit ARM / armv7l architecture. I.e. with this patch, the following steps now builds fine:
```
$ uname -m
armv7l
$ ./autogen.sh
$ cd depends && make NO_QT=1 && cd ..
$ ./configure --prefix=$(pwd)/depends/armv7l-unknown-linux-gnueabihf
$ make
```
Without this patch, the `cd depends && make NO_QT=1` command fails on armv7l.
Tree-SHA512: 1a81be2f1346e0e7080e83a991d9851f0371438262a34580eda5f43ebd220a3ce1ed0d783c43a0a8aed18082bbb1afc91e5c9bf3f4a36eecc82b6a9b6eff5e4c
| -rw-r--r-- | depends/Makefile | 1 | ||||
| -rw-r--r-- | depends/hosts/default.mk | 4 | ||||
| -rw-r--r-- | depends/packages/openssl.mk | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/depends/Makefile b/depends/Makefile index 0ddd348e53..14e94ba453 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -21,7 +21,6 @@ BUILD_ID_SALT ?= salt host:=$(BUILD) ifneq ($(HOST),) host:=$(HOST) -host_toolchain:=$(HOST)- endif ifneq ($(DEBUG),) diff --git a/depends/hosts/default.mk b/depends/hosts/default.mk index 6f60d6b3fd..144e5f88b7 100644 --- a/depends/hosts/default.mk +++ b/depends/hosts/default.mk @@ -1,3 +1,7 @@ +ifneq ($(host),$(build)) +host_toolchain:=$(host)- +endif + default_host_CC = $(host_toolchain)gcc default_host_CXX = $(host_toolchain)g++ default_host_AR = $(host_toolchain)ar diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 5ee9f17a63..37f0c28a52 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -47,6 +47,7 @@ $(package)_config_opts_linux=-fPIC -Wa,--noexecstack $(package)_config_opts_x86_64_linux=linux-x86_64 $(package)_config_opts_i686_linux=linux-generic32 $(package)_config_opts_arm_linux=linux-generic32 +$(package)_config_opts_armv7l_linux=linux-generic32 $(package)_config_opts_aarch64_linux=linux-generic64 $(package)_config_opts_mipsel_linux=linux-generic32 $(package)_config_opts_mips_linux=linux-generic32 |