aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorHenrik Jonsson <me@hkjn.me>2018-02-16 17:49:51 +0000
committerHenrik Jonsson <me@hkjn.me>2018-02-20 14:42:14 +0000
commitac91ea64c2b1daec8fee0bfde443c18cf87595ae (patch)
tree68edbad26dbf5c48d04d8f1b64b23f0a030ec949 /depends
parentffc6e48b2983189dc0ce7de0a038e5329bc07b1b (diff)
downloadbitcoin-ac91ea64c2b1daec8fee0bfde443c18cf87595ae.tar.xz
[depends] Allow depends system to support armv7l
Diffstat (limited to 'depends')
-rw-r--r--depends/Makefile1
-rw-r--r--depends/hosts/default.mk4
-rw-r--r--depends/packages/openssl.mk1
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