From 307d734335634211fe09d033efe42bd21c4a874f Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Thu, 16 Feb 2017 19:03:13 +0900 Subject: Place /tools at the end of PATH for the final stage3 builds. This is because otherwise we end up using the sysrooted /tools/sbin/ldconfig, causing the gcc build to fail as it does not find libz.so which is otherwise properly located if /sbin/ldconfig is used. --- build-essential/binutils.bst | 2 +- build-essential/busybox.bst | 2 +- build-essential/ccache.bst | 2 +- build-essential/fhs-dirs.bst | 2 +- build-essential/gawk.bst | 2 +- build-essential/gcc.bst | 2 +- build-essential/glibc.bst | 2 +- build-essential/linux-api-headers.bst | 2 +- build-essential/m4-tarball.bst | 2 +- build-essential/make.bst | 2 +- build-essential/zlib.bst | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-essential/binutils.bst b/build-essential/binutils.bst index 17459b9b..83b6d235 100644 --- a/build-essential/binutils.bst +++ b/build-essential/binutils.bst @@ -13,7 +13,7 @@ depends: - build-essential/zlib.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: diff --git a/build-essential/busybox.bst b/build-essential/busybox.bst index 1013600b..f2e9c667 100644 --- a/build-essential/busybox.bst +++ b/build-essential/busybox.bst @@ -12,7 +12,7 @@ depends: - build-essential/glibc.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: configure-commands: diff --git a/build-essential/ccache.bst b/build-essential/ccache.bst index d1b9ed74..085307e2 100644 --- a/build-essential/ccache.bst +++ b/build-essential/ccache.bst @@ -13,7 +13,7 @@ depends: - build-essential/zlib.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: configure-commands: diff --git a/build-essential/fhs-dirs.bst b/build-essential/fhs-dirs.bst index 3a2f9370..1a25b0a4 100644 --- a/build-essential/fhs-dirs.bst +++ b/build-essential/fhs-dirs.bst @@ -11,7 +11,7 @@ depends: type: build environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: install-commands: diff --git a/build-essential/gawk.bst b/build-essential/gawk.bst index a4072f36..57567900 100644 --- a/build-essential/gawk.bst +++ b/build-essential/gawk.bst @@ -12,7 +12,7 @@ depends: - build-essential/glibc.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: configure-commands: diff --git a/build-essential/gcc.bst b/build-essential/gcc.bst index e146af43..e835634e 100644 --- a/build-essential/gcc.bst +++ b/build-essential/gcc.bst @@ -15,7 +15,7 @@ depends: - build-essential/m4-tarball.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: diff --git a/build-essential/glibc.bst b/build-essential/glibc.bst index 32fdf774..1c10c678 100644 --- a/build-essential/glibc.bst +++ b/build-essential/glibc.bst @@ -12,7 +12,7 @@ depends: - build-essential/linux-api-headers.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: diff --git a/build-essential/linux-api-headers.bst b/build-essential/linux-api-headers.bst index d248cab0..7a405a4f 100644 --- a/build-essential/linux-api-headers.bst +++ b/build-essential/linux-api-headers.bst @@ -11,7 +11,7 @@ depends: type: build environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: install-commands: diff --git a/build-essential/m4-tarball.bst b/build-essential/m4-tarball.bst index fa6eb8ac..ff69768b 100644 --- a/build-essential/m4-tarball.bst +++ b/build-essential/m4-tarball.bst @@ -12,7 +12,7 @@ depends: - build-essential/glibc.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: configure-commands: diff --git a/build-essential/make.bst b/build-essential/make.bst index 2201fe33..9525487b 100644 --- a/build-essential/make.bst +++ b/build-essential/make.bst @@ -12,7 +12,7 @@ depends: - build-essential/glibc.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: diff --git a/build-essential/zlib.bst b/build-essential/zlib.bst index f6f08199..f64eeb43 100644 --- a/build-essential/zlib.bst +++ b/build-essential/zlib.bst @@ -12,7 +12,7 @@ depends: - build-essential/glibc.bst environment: - PATH: /tools/bin:/tools/sbin:/usr/bin:/bin:/usr/sbin:/sbin + PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin config: configure-commands: -- cgit v1.2.1