diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-09-12 14:31:48 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-10-25 13:41:36 +0000 |
commit | 1a43012e5c82b3ac165dcdb03dd5932a59c71830 (patch) | |
tree | 9460f1c002feb651eeafbf7c2727f8c75fdd93c9 | |
parent | 330c57ce57eca2ae63a7afee0d0eac32c4bda2b7 (diff) | |
download | definitions-1a43012e5c82b3ac165dcdb03dd5932a59c71830.tar.gz |
gnu-toolchain: Fix armv8l64 looking in the wrong place for libraries
-rw-r--r-- | elements/gnu-toolchain/stage2-gcc.bst | 10 | ||||
-rw-r--r-- | elements/gnu-toolchain/stage2-glibc.bst | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/elements/gnu-toolchain/stage2-gcc.bst b/elements/gnu-toolchain/stage2-gcc.bst index 13b925a9..25dbc65d 100644 --- a/elements/gnu-toolchain/stage2-gcc.bst +++ b/elements/gnu-toolchain/stage2-gcc.bst @@ -91,11 +91,11 @@ config: # gcc/config/i386/t-linux64 and this might break things, so for now we # tolerate the inconsistency. - | - if [ "$(echo %{target} | cut -c -6)" = "x86_64" ]; then - libdir=lib64 - else - libdir=lib - fi + case "$(echo %{target} | cut -c -6)" in + x86_64) libdir=lib64;; + armv8*64) libdir=lib64;; + *) libdir=lib + esac install -d "%{install-root}/usr/lib" ln -s "%{prefix}/$libdir/libgcc_s.so" "%{install-root}/usr/lib/" diff --git a/elements/gnu-toolchain/stage2-glibc.bst b/elements/gnu-toolchain/stage2-glibc.bst index 5f31e2f5..e3f13c35 100644 --- a/elements/gnu-toolchain/stage2-glibc.bst +++ b/elements/gnu-toolchain/stage2-glibc.bst @@ -120,10 +120,10 @@ config: ln -s "%{prefix}/lib/ld-linux-x86-64.so.2" \ "%{install-root}/usr/lib64/ld-linux-x86-64.so.2" ;; armv8*64) - install -d "%{install-root}/usr/lib64" + install -d "%{install-root}/usr/lib" ln -s "/usr/lib64" "%{install-root}/lib64" ln -s "%{prefix}/lib/ld-linux-aarch64.so.1" \ - "%{install-root}/usr/lib64/ld-linux-aarch64.so.1" ;; + "%{install-root}/usr/lib/ld-linux-aarch64.so.1" ;; ppc64l) install -d "%{install-root}/usr/lib64" ln -s "/usr/lib64" "%{install-root}/lib64" |