Skip to content

Commit 933f49d

Browse files
committed
Tweak scripts to allow Linux to find correct binaries, config and libraries
1 parent 0690d4c commit 933f49d

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

external/buildscripts/add_to_build_results/monodistribution/bin/mono-env

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ export MONO_PREFIX=$(dirname $0)/..
44
MONO=$MONO_PREFIX/$MONOBINDIR/mono
55
# remove //.. pattern as it causes problem on OSX High Sierra
66
MONO=${MONO/\/\/\./\/\.}
7-
export LD_LIBRARY_PATH=$MONO_PREFIX/lib
7+
LD_LIBRARY_PATH=$MONO_PREFIX/lib
8+
[ "$MONOLIBDIR" ] && LD_LIBRARY_PATH="$MONO_PREFIX/$MONOLIBDIR:$LD_LIBRARY_PATH"
9+
export LD_LIBRARY_PATH
10+
[ "$MONOETCDIR" ] && export MONO_CONFIG=$MONO_PREFIX/$MONOETCDIR/mono/config
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
MONOBINDIR=bin
2+
MONOLIBDIR=
3+
MONOETCDIR=
24

3-
os=$(uname -a)
5+
os=$(uname -s)
46
variant=$(uname -m)
57

68
case "$os" in
7-
*GNU/Linux* )
9+
Linux)
810
if [ "$variant" = "x86_64" ]; then
9-
MONOBINDIR=bin-linux64
11+
MONOBINDIR=bin-linux64
12+
MONOLIBDIR=../embedruntimes/linux64
13+
MONOETCDIR=etc-linux64
1014
else
11-
MONOBINDIR=bin-linux32
15+
MONOBINDIR=bin-linux32
16+
MONOLIBDIR=../embedruntimes/linux32
17+
MONOETCDIR=etc-linux32
1218
fi
1319
;;
1420
esac

0 commit comments

Comments
 (0)