From 93d824b053d8745cdf321de938bb52b3563479cd Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 9 Aug 2019 15:25:05 +0200 Subject: pre/toolchain: prepare to install most packages to pkgdir first This allows properly cleaning individual packages during testing and brings the toolchain closer to regular PTXdist BSPs. This makes it possible to reuse more generic code. Signed-off-by: Michael Olbrich --- config/Kconfig | 2 +- ...-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...arm-v7em-eabihf_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig | 2 +- ..._uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- .../arm-v7m-eabi_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig | 2 +- ..._uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- ...-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig | 2 +- rules/pre/toolchain.make | 8 +++++--- 20 files changed, 24 insertions(+), 22 deletions(-) diff --git a/config/Kconfig b/config/Kconfig index 35189c2..fa1b460 100644 --- a/config/Kconfig +++ b/config/Kconfig @@ -119,7 +119,7 @@ config PREFIX_CROSS config SYSROOT_CROSS string - default "${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" + default "${PTXCONF_DESTDIR}" config PREFIX_TARGET string diff --git a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index e2e6525..d12ec80 100644 --- a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -145,7 +145,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-clang-${PTXCONF_CROSS_CLANG_VERSION}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 49480c0..8b6ec77 100644 --- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 41465f5..3422e2c 100644 --- a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 52e26da..28ff3ce 100644 --- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 872c311..74914e5 100644 --- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index de81253..a347bc8 100644 --- a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -145,7 +145,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-clang-${PTXCONF_CROSS_CLANG_VERSION}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index f89ccbc..eae669e 100644 --- a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -145,7 +145,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-clang-${PTXCONF_CROSS_CLANG_VERSION}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v7em-eabihf_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig b/ptxconfigs/arm-v7em-eabihf_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig index d7799ff..8174180 100644 --- a/ptxconfigs/arm-v7em-eabihf_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig +++ b/ptxconfigs/arm-v7em-eabihf_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig @@ -120,7 +120,7 @@ PTXCONF_PREFIX="/opt" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}-newlib-${PTXCONF_NEWLIB_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig index b45ed6b..3eedaab 100644 --- a/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-v7em-uclinuxeabihf_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -128,7 +128,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-uclibc-${PTXCONF_UCLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v7m-eabi_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig b/ptxconfigs/arm-v7m-eabi_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig index 377f426..9eed89c 100644 --- a/ptxconfigs/arm-v7m-eabi_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig +++ b/ptxconfigs/arm-v7m-eabi_gcc-9.1.1_newlib-3.0.0_binutils-2.32.ptxconfig @@ -120,7 +120,7 @@ PTXCONF_PREFIX="/opt" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}-newlib-${PTXCONF_NEWLIB_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 9d4999f..aafc969 100644 --- a/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/arm-v7m-uclinuxeabi_gcc-9.1.1_uclibc-ng-1.0.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -128,7 +128,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-uclibc-${PTXCONF_UCLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 448ba9b..00b908d 100644 --- a/ptxconfigs/i586-unknown-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/i686-atom-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/i686-atom-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 5fc979f..ddefb89 100644 --- a/ptxconfigs/i686-atom-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/i686-atom-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/mips-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/mips-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 82a62cf..4a72129 100644 --- a/ptxconfigs/mips-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/mips-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index cbaf4b4..5ac7f36 100644 --- a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 9e0e1ec..9c24154 100644 --- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/riscv64-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/riscv64-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 16327b0..4f9913e 100644 --- a/ptxconfigs/riscv64-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/riscv64-linux-gnu_gcc-9.1.1_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -134,7 +134,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig index 1ef3b05..233e340 100644 --- a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig +++ b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-9.1.1_clang-8.0.0_glibc-2.29_binutils-2.32_kernel-5.0-sanitized.ptxconfig @@ -145,7 +145,7 @@ PTXCONF_PREFIX_KERNEL="-sanitized" PTXCONF_PREFIX_TCID="gcc-${PTXCONF_CROSS_GCC_VERSION}${PTXCONF_PREFIX_JAVA}-clang-${PTXCONF_CROSS_CLANG_VERSION}-glibc-${PTXCONF_GLIBC_VERSION}-binutils-${PTXCONF_CROSS_BINUTILS_VERSION}-kernel-${PTXCONF_KERNEL_HEADERS_VERSION}${PTXCONF_PREFIX_KERNEL}" PTXCONF_SYSROOT_HOST="${PTXDIST_PLATFORMDIR}/sysroot-host" PTXCONF_PREFIX_CROSS="${PTXCONF_PREFIX}/${PTXCONF_PROJECT}/${PTXCONF_GNU_TARGET}/${PTXCONF_PREFIX_TCID}" -PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_CROSS}" +PTXCONF_SYSROOT_CROSS="${PTXCONF_DESTDIR}" PTXCONF_PREFIX_TARGET="${PTXCONF_PREFIX_CROSS}/sysroot-${PTXCONF_GNU_TARGET}" PTXCONF_SYSROOT_TARGET="${PTXCONF_DESTDIR}${PTXCONF_PREFIX_TARGET}" PTXCONF_PLATFORM="${PTXCONF_GNU_TARGET}-${PTXCONF_PREFIX_TCID}" diff --git a/rules/pre/toolchain.make b/rules/pre/toolchain.make index 76227ca..b809823 100644 --- a/rules/pre/toolchain.make +++ b/rules/pre/toolchain.make @@ -16,6 +16,7 @@ PTXCONF_CROSS_GCC_CONFIG_CXA_ATEXIT := $(call remove_quotes, $(PTXCONF_CROSS_GC PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS := $(call remove_quotes, $(PTXCONF_CROSS_GCC_CONFIG_SJLJ_EXCEPTIONS)) PTXCONF_CROSS_GCC_CONFIG_LIBSSP := $(call remove_quotes, $(PTXCONF_CROSS_GCC_CONFIG_LIBSSP)) PTXCONF_CROSS_GCC_CONFIG_SHARED := $(call remove_quotes, $(PTXCONF_CROSS_GCC_CONFIG_SHARED)) +PTXCONF_PREFIX_CROSS := $(call remove_quotes, $(PTXCONF_PREFIX_CROSS)) PTXCONF_ARCH := $(call remove_quotes, $(PTXCONF_ARCH)) @@ -63,14 +64,15 @@ endif # gcc-first # CROSS_GCC_FIRST_PREFIX := $(PTXDIST_PLATFORMDIR)/sysroot-target -CROSS_PATH := $(PTXCONF_SYSROOT_CROSS)/bin:$(PTXCONF_SYSROOT_CROSS)/sbin:$(CROSS_GCC_FIRST_PREFIX)/bin:$(PATH) +CROSS_PATH := $(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/bin:$(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/sbin:$(CROSS_GCC_FIRST_PREFIX)/bin:$(PATH) +HOST_CROSS_PATH := $(CROSS_PATH) # # debuggable gcc/glibc # ifdef PTXCONF_TOOLCHAIN_DEBUG -BUILDDIR_DEBUG := $(PTXCONF_SYSROOT_CROSS)/src/target -BUILDDIR_CROSS_DEBUG := $(PTXCONF_SYSROOT_CROSS)/src/cross +BUILDDIR_DEBUG := $(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/src/target +BUILDDIR_CROSS_DEBUG := $(PTXDIST_SYSROOT_CROSS)$(PTXCONF_PREFIX_CROSS)/src/cross else BUILDDIR_DEBUG := $(BUILDDIR) BUILDDIR_CROSS_DEBUG := $(CROSS_BUILDDIR) -- cgit v1.2.3