Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into feature/shell-scripts
  • Loading branch information
am11 authored Dec 20, 2022
commit 03e270b64f4cea54977fe2a8badb2022dd3a68bc
2 changes: 1 addition & 1 deletion eng/common/native/init-compiler.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ if [ -z "$CC" ]; then
fi

# Only lld version >= 9 can be considered stable
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ]; then
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
LDFLAGS="-fuse-ld=lld"
fi
Expand Down
10 changes: 2 additions & 8 deletions eng/configure-toolset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@ function Test-FilesUseTelemetryOutput {
'eng/common/build.sh'
'eng/common/cibuild.sh'
'eng/common/native/init-compiler.sh'
'eng/common/cross/arm/tizen-build-rootfs.sh'
'eng/common/cross/arm/tizen-fetch.sh'
'eng/common/cross/armel/tizen-build-rootfs.sh'
'eng/common/cross/armel/tizen-fetch.sh'
'eng/common/cross/arm64/tizen-build-rootfs.sh'
'eng/common/cross/arm64/tizen-fetch.sh'
'eng/common/cross/x86/tizen-build-rootfs.sh'
'eng/common/cross/x86/tizen-fetch.sh'
'eng/common/cross/tizen-build-rootfs.sh'
'eng/common/cross/tizen-fetch.sh'
'eng/common/cross/build-android-rootfs.sh'
'eng/common/cross/build-rootfs.sh'
'eng/common/darc-init.sh'
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.