# HG changeset patch # User Rob Landley # Date 1408936985 18000 # Node ID c11a357ea92d6471f22070cee021683ea2308409 # Parent 0f4499211cfa77eef2df55039136b0406f04d720 Second attempt: make dynamic linker match libc in ccwrap. Building uClibc requires the wrapper, so we can't have the wrapper look for and _existing_ dynamic linker, so the wrapper script has to check the config. diff -r 0f4499211cfa -r c11a357ea92d sources/sections/ccwrap.sh --- a/sources/sections/ccwrap.sh Sun Aug 17 18:12:50 2014 -0500 +++ b/sources/sections/ccwrap.sh Sun Aug 24 22:23:05 2014 -0500 @@ -4,12 +4,15 @@ [ "$BUILD_STATIC" == none ] && STATIC_FLAGS= || STATIC_FLAGS=--static [ -z "$HOST_ARCH" ] && TEMP="$CC" || TEMP="${HOST_ARCH}-cc" +LIBC_TYPE=musl +[ ! -z "$UCLIBC_CONFIG" ] && [ -z "$MUSL" ] && LIBC_TYPE=uClibc # Build wrapper binary mkdir -p "$STAGE_DIR/bin" && "$TEMP" "$SOURCES/toys/ccwrap.c" -Os $CFLAGS \ - -o "$STAGE_DIR/bin/${TOOLCHAIN_PREFIX}cc" $STATIC_FLAGS -DDYNAMIC_LINKER=\"/lib/$(cd $STAGE_DIR/lib; ls ld-*.so.0)\" && + -o "$STAGE_DIR/bin/${TOOLCHAIN_PREFIX}cc" $STATIC_FLAGS \ + -DDYNAMIC_LINKER=\"/lib/ld-${LIBC_TYPE}.so.0\" && echo -e "#!/bin/bash\n\n${TOOLCHAIN_PREFIX}cc -E "'"$@"' \ > "$STAGE_DIR/bin/${TOOLCHAIN_PREFIX}cpp" && chmod +x "$STAGE_DIR/bin/${TOOLCHAIN_PREFIX}cpp" || dienow