From cd0d9657acec4b0c66dbe78c3358c287b2c79d14 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 20 Jun 2017 08:49:22 +0000 Subject: gnu-toolchain: Fix more %{bst-arch} to %{bst-target-arch} --- elements/gnu-toolchain/gcc.bst | 4 ++-- elements/gnu-toolchain/linux-api-headers.bst | 4 ++-- elements/gnu-toolchain/stage1-gcc.bst | 4 ++-- elements/gnu-toolchain/stage2-gcc.bst | 4 ++-- elements/gnu-toolchain/stage2-glibc.bst | 6 +++--- elements/gnu-toolchain/stage2-linux-api-headers.bst | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/elements/gnu-toolchain/gcc.bst b/elements/gnu-toolchain/gcc.bst index b7b17ae6..b69d8d30 100644 --- a/elements/gnu-toolchain/gcc.bst +++ b/elements/gnu-toolchain/gcc.bst @@ -30,7 +30,7 @@ config: # 2. Avoid having more than one copy of ZLib in use on the system # 3. Multilib does not make sense in Baserock. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ @@ -50,7 +50,7 @@ config: build-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5*) sed -i "s/--host=none/--host=armv5/" o/Makefile sed -i "s/--target=none/--target=armv5/" o/Makefile ;; armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile diff --git a/elements/gnu-toolchain/linux-api-headers.bst b/elements/gnu-toolchain/linux-api-headers.bst index 0020d2ae..db89f18d 100644 --- a/elements/gnu-toolchain/linux-api-headers.bst +++ b/elements/gnu-toolchain/linux-api-headers.bst @@ -17,7 +17,7 @@ environment: config: install-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5l) ARCH="arm" ;; armv7b|armv7l|armv7lhf) @@ -31,7 +31,7 @@ config: ppc64) ARCH="powerpc" ;; *) - echo "Error: unsupported Morph architecture: %{bst-arch}" >&2 + echo "Error: unsupported architecture: %{bst-target-arch}" >&2 exit 1 esac ARCH=$ARCH make INSTALL_HDR_PATH=dest headers_install diff --git a/elements/gnu-toolchain/stage1-gcc.bst b/elements/gnu-toolchain/stage1-gcc.bst index 430a5d37..13611d62 100644 --- a/elements/gnu-toolchain/stage1-gcc.bst +++ b/elements/gnu-toolchain/stage1-gcc.bst @@ -42,7 +42,7 @@ config: # without an existing libc, and generally try to keep this build as # simple as possible. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ @@ -87,7 +87,7 @@ config: # code results on an undefined reference to `__gmpn_invert_limb' in # ARMv7. Fix the invocation of GMP's configure script so that GMP can # use the machine-dependent code. - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5*) sed -i "s/--host=none/--host=armv5/" o/Makefile sed -i "s/--target=none/--target=armv5/" o/Makefile ;; armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst index 18594d8f..f5572139 100644 --- a/elements/gnu-toolchain/stage2-gcc.bst +++ b/elements/gnu-toolchain/stage2-gcc.bst @@ -40,7 +40,7 @@ config: # 4. This flag causes the correct --sysroot flag to be passed when # calling stage 1 GCC. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \ --with-cpu=cortex-a9 \ --with-tune=cortex-a9 \ @@ -71,7 +71,7 @@ config: build-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5*) sed -i "s/--host=none/--host=armv5/" o/Makefile sed -i "s/--target=none/--target=armv5/" o/Makefile ;; armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst index 1c3745e1..ac7a8446 100644 --- a/elements/gnu-toolchain/stage2-glibc.bst +++ b/elements/gnu-toolchain/stage2-glibc.bst @@ -31,7 +31,7 @@ config: # 4. Force configuration values of certain things that can't be detected # in a cross-compile. - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv7*) ARCH_FLAGS="--without-fp" ;; esac @@ -105,12 +105,12 @@ config: # sysdeps/unix/sysv/linux/configure. - install -d %{install-root}/lib - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in x86_64) install -d "%{install-root}/lib64" ln -s "%{prefix}/lib/ld-linux-x86-64.so.2" \ "%{install-root}/lib64/ld-linux-x86-64.so.2" ;; - ppc64) + ppc64l|ppc64b) install -d "%{install-root}/lib64" ln -s "%{prefix}/lib/ld64.so.1" \ "%{install-root}/lib64/ld64.so.1" ;; diff --git a/elements/gnu-toolchain/stage2-linux-api-headers.bst b/elements/gnu-toolchain/stage2-linux-api-headers.bst index e5869bf1..10ec224a 100644 --- a/elements/gnu-toolchain/stage2-linux-api-headers.bst +++ b/elements/gnu-toolchain/stage2-linux-api-headers.bst @@ -19,7 +19,7 @@ environment: config: install-commands: - | - case "%{bst-arch}" in + case "%{bst-target-arch}" in armv5l) ARCH="arm" ;; armv7b|armv7l|armv7lhf) @@ -30,10 +30,10 @@ config: ARCH="i386" ;; x86_64) ARCH="x86_64" ;; - ppc64) + ppc64b|ppc64l) ARCH="powerpc" ;; *) - echo "Error: unsupported Morph architecture: %{bst-arch}" >&2 + echo "Error: unsupported architecture: %{bst-target-arch}" >&2 exit 1 esac ARCH=$ARCH make INSTALL_HDR_PATH=dest headers_install -- cgit v1.2.1