blob: 8faaedde9243ef3f0825f79d0ecfbc6cc86f9e35 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
https://github.com/OpenRA/OpenRA/pull/21382
https://github.com/OpenRA/OpenRA/issues/21353
From 5ec6e5d5a45855e047d251864292524a9b7a4597 Mon Sep 17 00:00:00 2001
From: Jakub Vesely <jakub.vesely2@gmail.com>
Date: Mon, 1 Apr 2024 15:03:00 +0200
Subject: [PATCH] configure-system-libraries.sh: Skip 32bit libraries during
lookup on x64 Linux. #21353
--- a/configure-system-libraries.sh
+++ b/configure-system-libraries.sh
@@ -5,7 +5,6 @@
# This file must stay /bin/sh and POSIX compliant for macOS and BSD portability.
# Copy-paste the entire script into http://shellcheck.net to check.
####
-
set -o errexit || exit $?
patch_config()
@@ -37,11 +36,18 @@ patch_config()
if [ -L "bin/${REPLACE}" ]; then
return 0
fi
-
+ KERNEL="$(uname -s)"
+ ARCH="$(arch)"
printf "Searching for %s... " "${LABEL}"
for DIR in ${SEARCHDIRS} ; do
for LIB in ${SEARCH}; do
if [ -f "${DIR}/${LIB}" ]; then
+ # x86-64 Linux might have 32-bit libraries present, link against the 64 bit libraries since there is no 32-bit Linux release of dotnet
+ if [ "${KERNEL}" = "Linux" ] && [ "${ARCH}" = "x86_64" ]; then
+ if [ "$(LANG=C file -L -b "${DIR}/${LIB}" | cut -d" " -f2)" != "64-bit" ]; then
+ continue
+ fi
+ fi
echo "${LIB}"
ln -s "${DIR}/${LIB}" "bin/${REPLACE}"
return 0
|
GitWeb
