From b0f692f81e22587ca98e893a6eb0b6246c5b62b0 Mon Sep 17 00:00:00 2001 From: Henrik Jonsson Date: Fri, 16 Feb 2018 17:49:51 +0000 Subject: [PATCH] [depends] Allow depends system to support armv7l Github-Pull: #12474 Rebased-From: ac91ea64c2b1daec8fee0bfde443c18cf87595ae Tree-SHA512: 61020cab59532738bc876fc4591923a5b48fee7c5729419bc42654d714cd6cad685e6482e199a17bb57ea97edcd129a15561939d55fa40661d8f051329942bdb --- depends/Makefile | 1 - depends/hosts/default.mk | 4 ++++ depends/packages/openssl.mk | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/depends/Makefile b/depends/Makefile index 0ddd348e5..14e94ba45 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 6f60d6b3f..144e5f88b 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 5ee9f17a6..37f0c28a5 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