Modify demos to enable autodep without creating softlinks

This commit is contained in:
jianfengjiang 2021-09-22 15:57:14 +08:00 committed by Zongmin.Gu
parent 0fa5f434cc
commit 9a85361e35
3 changed files with 0 additions and 13 deletions

@ -87,12 +87,6 @@ run_processBuilder() {
-Djdk.lang.Process.launchMechanism=posix_spawn processBuilder -Djdk.lang.Process.launchMechanism=posix_spawn processBuilder
} }
# check if the libz softlink exists. If not, create the softlink to enable autodep for java
libz_file=/lib/libz.so.1
if [ ! -f ${libz_file} ];then
ln -sf /usr/local/occlum/x86_64-linux-musl/lib/libz.so.1 ${libz_file}
fi
arg=$1 arg=$1
case "$arg" in case "$arg" in
web_app) web_app)

@ -31,7 +31,3 @@ CFLAGS="-O2 -g ${EXTRA_CFLAGS}" ${SRC_DIR}/configure \
--enable-stack-protector=strong --disable-nscd ${EXTRA_CONFIG_OPTION} --enable-stack-protector=strong --disable-nscd ${EXTRA_CONFIG_OPTION}
make make
make install make install
# prepare softlinks to enable autodep for C++
ln -sf /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /opt/occlum/glibc/lib/libstdc++.so.6
ln -sf /lib/x86_64-linux-gnu/libgcc_s.so.1 /opt/occlum/glibc/lib/libgcc_s.so.1

@ -41,6 +41,3 @@ EOF
chmod +x ${INSTALL_DIR}/bin/occlum-java chmod +x ${INSTALL_DIR}/bin/occlum-java
chmod +x ${INSTALL_DIR}/bin/occlum-javac chmod +x ${INSTALL_DIR}/bin/occlum-javac
# create softlink for libz to enable autodep for java
ln -sf /usr/local/occlum/x86_64-linux-musl/lib/libz.so.1 /lib/libz.so.1