Commit 17f7877b authored by jan.koester's avatar jan.koester
Browse files

test

parent fb9d8334

packaging/build-nspawn.sh

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ while [[ $# -gt 0 ]]; do 
            ;;

        chroot|toolchain|libraries|update-libs|blogi|all)

            PHASES+=("$1"); shift ;;

        *) echo "Unknown option: $1"; exit 1 ;;

            COMPILE_FLAGS="--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -nostdinc++ -isystem /usr/local/musl/include/c++/v1 -isystem ${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC"

    esac

done
@@ -271,7 +271,7 @@ setup_toolchain() { 
    '



    # ── Phase 2b-2: Generate wrapper compilers + toolchain file (always, cheap) ──

    echo "==> Generating compiler wrappers and toolchain file..."

                COMPILE_FLAGS=\"--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -isystem \${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC\"\"



    systemd-nspawn -D "$CHROOT_DIR" --pipe -- bash -c "

        set -e
@@ -300,7 +300,7 @@ if [ \"\\\$LINKING\" = \"1\" ]; then 
        -lc++ -lc++abi -lunwind -lc -lclang_rt.builtins-x86_64 \\\\

        -Wl,--dynamic-linker=/lib/ld-musl-x86_64.so.1 \\\\

        /usr/local/musl/lib/crtn.o \\\\

        -Wl,-rpath,/usr/local/musl/lib -Wl,-rpath,/usr/local/lib \\\\

                COMPILE_FLAGS=\"--target=x86_64-linux-musl --sysroot=/usr/local/musl -nostdinc -isystem \${CLANG_RESOURCE}/include -isystem /usr/local/musl/include -fPIC\"\"

        \"\\\$@\"

else

    exec clang++-${LLVM_VERSION} \\\$COMPILE_FLAGS \"\\\$@\"