From ca45a8f9abd672189dbef5bcb242ac465df7b0f6 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 30 Sep 2017 18:47:35 -0700 Subject: Add -D__GLIBC__ to target CFLAGS ... when using musl to compile strace. Also, honor CT_TARGET_CFLAGS in scripts compiling target libs/binaries. Signed-off-by: Alexey Neyman --- scripts/build/debug/500-strace.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'scripts/build/debug/500-strace.sh') diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index cb4643af..305a76c2 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -1,21 +1,36 @@ # Build script for strace -do_debug_strace_get() { +do_debug_strace_get() +{ CT_Fetch STRACE } -do_debug_strace_extract() { +do_debug_strace_extract() +{ CT_ExtractPatch STRACE } -do_debug_strace_build() { +do_debug_strace_build() +{ + local cflags="${CT_TARGET_CFLAGS}" + CT_DoStep INFO "Installing strace" + if [ "${CT_LIBC_MUSL}" = "y" ]; then + # Otherwise kernel headers cause errors when included, e.g. + # and . Kernel's libc-compat.h + # only cares about GLIBC. uClibc-ng does the same + # internally, pretending it's GLIBC for kernel headers inclusion. + cflags+=" -D__GLIBC__" + fi + CT_mkdir_pushd "${CT_BUILD_DIR}/build-strace" CT_DoLog EXTRA "Configuring strace" CT_DoExecLog CFG \ CC="${CT_TARGET}-${CT_CC}" \ + CFLAGS="${cflags}" \ + LDFLAGS="${CT_TARGET_LDFLAGS}" \ CPP="${CT_TARGET}-cpp" \ LD="${CT_TARGET}-ld" \ ${CONFIG_SHELL} \ -- cgit v1.2.3