Skip to content

Commit 28b8061

Browse files
committed
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
2 parents 8c33961 + ac91ea6 commit 28b8061

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

depends/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ BUILD_ID_SALT ?= salt
2121
host:=$(BUILD)
2222
ifneq ($(HOST),)
2323
host:=$(HOST)
24-
host_toolchain:=$(HOST)-
2524
endif
2625

2726
ifneq ($(DEBUG),)

depends/hosts/default.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
ifneq ($(host),$(build))
2+
host_toolchain:=$(host)-
3+
endif
4+
15
default_host_CC = $(host_toolchain)gcc
26
default_host_CXX = $(host_toolchain)g++
37
default_host_AR = $(host_toolchain)ar

depends/packages/openssl.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ $(package)_config_opts_linux=-fPIC -Wa,--noexecstack
4747
$(package)_config_opts_x86_64_linux=linux-x86_64
4848
$(package)_config_opts_i686_linux=linux-generic32
4949
$(package)_config_opts_arm_linux=linux-generic32
50+
$(package)_config_opts_armv7l_linux=linux-generic32
5051
$(package)_config_opts_aarch64_linux=linux-generic64
5152
$(package)_config_opts_mipsel_linux=linux-generic32
5253
$(package)_config_opts_mips_linux=linux-generic32

0 commit comments

Comments
 (0)