NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain-external: improve musl external check

Browse Source 
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>
This commit is contained in:
Ilya Kuzmich 2017-03-20 08:56:10 +03:00 committed by Thomas Petazzoni
parent 9397bd643d
commit 3b328897f5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolchain/helpers.mk
View File

@ -197,13 +197,18 @@ check_glibc = \
# #
# Check that the selected C library really is musl # Check that the selected C library really is musl
# #
# $1: sysroot directory # $1: cross-gcc path
# $2: cross-readelf path
check_musl = \ check_musl = \
SYSROOT_DIR="$(strip $1)"; \ __CROSS_CC=$(strip $1) ; \
if test ! -f $${SYSROOT_DIR}/lib/libc.so -o -e $${SYSROOT_DIR}/lib/libm.so ; then \ __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" ; \ echo "Incorrect selection of the C library" ; \
exit -1; \ exit -1; \
fi fi ; \
rm -f $(BUILD_DIR)/.br-toolchain-test.tmp*
# #
# Check the conformity of Buildroot configuration with regard to the # Check the conformity of Buildroot configuration with regard to the

4
toolchain/toolchain-external/pkg-toolchain-external.mk
View File

@ -565,7 +565,9 @@ define $(2)_CONFIGURE_CMDS
if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \ if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \
$$(call check_uclibc,$$$${SYSROOT_DIR}) ; \ $$(call check_uclibc,$$$${SYSROOT_DIR}) ; \
elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \ 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 \ else \
$$(call check_glibc,$$$${SYSROOT_DIR}) ; \ $$(call check_glibc,$$$${SYSROOT_DIR}) ; \
fi fi