Skip to content

Commit cf0f25c

Browse files
committed
Prepend system LD_LIBRARY_PATH
1 parent 1efe587 commit cf0f25c

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ProgramExe/FlashTool

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ then
5353
then
5454
if test $ISJAVA64 -gt 0
5555
then
56-
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib64
56+
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib64:$LD_LIBRARY_PATH
5757
UDEV=$(ldd x10flasher_lib/linux/lib64/udev/libusbx-1.0.so.0.1.0 |grep found|wc -l)
5858
if test $UDEV -gt 0
5959
then
@@ -69,7 +69,7 @@ then
6969
chmod 755 ./x10flasher_lib/unyaffs.linux.x64
7070
ln -sf unyaffs.linux.x64 ./x10flasher_lib/unyaffs.linux
7171
else
72-
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib32
72+
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib32:$LD_LIBRARY_PATH
7373
UDEV=$(ldd x10flasher_lib/linux/lib32/udev/libusbx-1.0.so.0.1.0 |grep found|wc -l)
7474
if test $UDEV -gt 0
7575
then
@@ -125,4 +125,4 @@ else
125125
else
126126
echo "Java version must be 1.8"
127127
fi
128-
fi
128+
fi

ProgramExe/FlashToolConsole

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ then
167167
fi
168168
if test -e ${JAVA_HOME}/bin/java
169169
then
170-
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib32
170+
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib32:$LD_LIBRARY_PATH
171171
export LD_LIBRARY_PATH=./x10flasher_lib/linux/lib64:$LD_LIBRARY_PATH
172172
ln -sf libusbx-1.0.so.0.1.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
173173
ln -sf libusbx-1.0.so.0.1.0 ./x10flasher_lib/linux/lib64/libusbx-1.0.so

0 commit comments

Comments
 (0)