aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Ilya Kuzmich <ilya.kuzmich@gmail.com>2017-03-20 08:56:10 +0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-26 15:21:38 +0200
commit3b328897f5d86b3607e89ae2134319fc2c881b16 (patch)
tree65374a151b6ed3d4d79d2ef703f4db3144a84963 /toolchain
parent9397bd643d2f64bd61843addd238ccee9ce66b1f (diff)
downloadbuildroot-3b328897f5d86b3607e89ae2134319fc2c881b16.tar.gz
buildroot-3b328897f5d86b3607e89ae2134319fc2c881b16.tar.bz2
toolchain-external: improve musl external check
The current test to verify if the toolchain uses musl or not is based on checking if /lib/libc.so or /lib/libm.so exist in the sysroot. However, some toolchains (notably Crosstool-NG ones) put these libraries in /usr/lib/. To fix this, build a minimal C program and check if the program interpreter contains /lib/ld-musl. Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/helpers.mk13
-rw-r--r--toolchain/toolchain-external/pkg-toolchain-external.mk4
2 files changed, 12 insertions, 5 deletions
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 2f73ebbe8b..77303a86eb 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -197,13 +197,18 @@ check_glibc = \
#
# Check that the selected C library really is musl
#
-# $1: sysroot directory
+# $1: cross-gcc path
+# $2: cross-readelf path
check_musl = \
- SYSROOT_DIR="$(strip $1)"; \
- if test ! -f $${SYSROOT_DIR}/lib/libc.so -o -e $${SYSROOT_DIR}/lib/libm.so ; then \
+ __CROSS_CC=$(strip $1) ; \
+ __CROSS_READELF=$(strip $2) ; \
+ echo 'void main(void) {}' | $${__CROSS_CC} -x c -o $(BUILD_DIR)/.br-toolchain-test.tmp - >/dev/null 2>&1; \
+ if ! $${__CROSS_READELF} -l $(BUILD_DIR)/.br-toolchain-test.tmp 2> /dev/null | grep 'program interpreter: /lib/ld-musl' -q; then \
+ rm -f $(BUILD_DIR)/.br-toolchain-test.tmp*; \
echo "Incorrect selection of the C library" ; \
exit -1; \
- fi
+ fi ; \
+ rm -f $(BUILD_DIR)/.br-toolchain-test.tmp*
#
# Check the conformity of Buildroot configuration with regard to the
diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk
index 1d12290cfb..8bb7b40d12 100644
--- a/toolchain/toolchain-external/pkg-toolchain-external.mk
+++ b/toolchain/toolchain-external/pkg-toolchain-external.mk
@@ -565,7 +565,9 @@ define $(2)_CONFIGURE_CMDS
if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \
$$(call check_uclibc,$$$${SYSROOT_DIR}) ; \
elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \
- $$(call check_musl,$$$${SYSROOT_DIR}) ; \
+ $$(call check_musl,\
+ "$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\
+ $$(TOOLCHAIN_EXTERNAL_READELF)) ; \
else \
$$(call check_glibc,$$$${SYSROOT_DIR}) ; \
fi