From 9a85361e355b31747ea5b1075066a5b3cb6bef91 Mon Sep 17 00:00:00 2001 From: jianfengjiang Date: Wed, 22 Sep 2021 15:57:14 +0800 Subject: [PATCH] Modify demos to enable autodep without creating softlinks --- demos/java/run_java_on_occlum.sh | 6 ------ tools/toolchains/glibc/build.sh | 4 ---- tools/toolchains/java/install_dragonwell.sh | 3 --- 3 files changed, 13 deletions(-) diff --git a/demos/java/run_java_on_occlum.sh b/demos/java/run_java_on_occlum.sh index 17c02774..1c7d5b5f 100755 --- a/demos/java/run_java_on_occlum.sh +++ b/demos/java/run_java_on_occlum.sh @@ -87,12 +87,6 @@ run_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 case "$arg" in web_app) diff --git a/tools/toolchains/glibc/build.sh b/tools/toolchains/glibc/build.sh index b004a417..4c45c3f8 100755 --- a/tools/toolchains/glibc/build.sh +++ b/tools/toolchains/glibc/build.sh @@ -31,7 +31,3 @@ CFLAGS="-O2 -g ${EXTRA_CFLAGS}" ${SRC_DIR}/configure \ --enable-stack-protector=strong --disable-nscd ${EXTRA_CONFIG_OPTION} make 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 \ No newline at end of file diff --git a/tools/toolchains/java/install_dragonwell.sh b/tools/toolchains/java/install_dragonwell.sh index 019daae0..a801a35e 100755 --- a/tools/toolchains/java/install_dragonwell.sh +++ b/tools/toolchains/java/install_dragonwell.sh @@ -41,6 +41,3 @@ EOF chmod +x ${INSTALL_DIR}/bin/occlum-java 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