tests: fix lld unavailability in ppc64 for toolchains tests
This commit is contained in:
parent
a52939e013
commit
4ae8585417
@ -13,9 +13,6 @@ adjust:
|
|||||||
- compiler-rt
|
- compiler-rt
|
||||||
- lld
|
- lld
|
||||||
when: "collection is not defined"
|
when: "collection is not defined"
|
||||||
- require-:
|
|
||||||
- lld
|
|
||||||
when: collection is not defined and arch == s390x
|
|
||||||
|
|
||||||
# Requirements for SCL-ized LLVM
|
# Requirements for SCL-ized LLVM
|
||||||
- require+:
|
- require+:
|
||||||
@ -23,17 +20,19 @@ adjust:
|
|||||||
- llvm-toolset-13.0-compiler-rt
|
- llvm-toolset-13.0-compiler-rt
|
||||||
- llvm-toolset-13.0-lld
|
- llvm-toolset-13.0-lld
|
||||||
when: "collection == llvm-toolset-13.0"
|
when: "collection == llvm-toolset-13.0"
|
||||||
- require-:
|
|
||||||
- llvm-toolset-13.0-lld
|
|
||||||
when: collection == llvm-toolset-13.0 and arch == s390x
|
|
||||||
- require+:
|
- require+:
|
||||||
- llvm-toolset-14.0-clang
|
- llvm-toolset-14.0-clang
|
||||||
- llvm-toolset-14.0-compiler-rt
|
- llvm-toolset-14.0-compiler-rt
|
||||||
- llvm-toolset-14.0-lld
|
- llvm-toolset-14.0-lld
|
||||||
when: "collection == llvm-toolset-14.0"
|
when: "collection == llvm-toolset-14.0"
|
||||||
|
|
||||||
|
# lld not supported in s390x or ppc64. If any lld package was added to
|
||||||
|
# requirements, remove it.
|
||||||
- require-:
|
- require-:
|
||||||
|
- lld
|
||||||
|
- llvm-toolset-13.0-lld
|
||||||
- llvm-toolset-14.0-lld
|
- llvm-toolset-14.0-lld
|
||||||
when: collection == llvm-toolset-14.0 and arch == s390x
|
when: arch == s390x or arch == ppc64
|
||||||
|
|
||||||
- environment+:
|
- environment+:
|
||||||
CXXLIBS: "libc++"
|
CXXLIBS: "libc++"
|
||||||
|
@ -80,8 +80,10 @@ for compiler in clang clang++; do
|
|||||||
args="$args -pthread"
|
args="$args -pthread"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# lld is not supported in s390x
|
# lld is not supported in s390x and ppc64
|
||||||
if [[ "$(uname -m)" = "s390x" && "$linker" = "lld" ]]; then
|
if [[ "$(uname -m)" = "s390x" || "$(uname -m)" = "ppc64" ]] \
|
||||||
|
&& [[ "$linker" = "lld" ]];
|
||||||
|
then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user