Commit a42a5ede authored by chen2022's avatar chen2022

补充build_helper.local

parents 4e789fa2 e2a763d2
...@@ -27,8 +27,9 @@ INSTALL_DIR=/usr/local/bin ...@@ -27,8 +27,9 @@ INSTALL_DIR=/usr/local/bin
# include helper functions # include helper functions
################################ ################################
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0)) THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
source ${THIS_SCRIPT_PATH}/build_helper.amf #source ${THIS_SCRIPT_PATH}/build_helper.amf
#source ${THIS_SCRIPT_PATH}/build_helper.local source ${THIS_SCRIPT_PATH}/build_helper.local
function help() function help()
{ {
echo_error " " echo_error " "
......
...@@ -81,7 +81,7 @@ install_cnlibs() { ...@@ -81,7 +81,7 @@ install_cnlibs() {
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
popd popd
fi fi
##https://github.com/google/googletest/archive/release-1.8.0.tar.gz -------------- ##https://github.com/google/googletest/archive/release-1.8.0.tar.gz --------------
...@@ -128,6 +128,7 @@ install_cnlibs() { ...@@ -128,6 +128,7 @@ install_cnlibs() {
cd .. cd ..
fi fi
fi fi
## ##
cd /tmp cd /tmp
rm -rf /tmp/openxg-cnlibs* rm -rf /tmp/openxg-cnlibs*
...@@ -262,7 +263,6 @@ check_install_amf_deps(){ ...@@ -262,7 +263,6 @@ check_install_amf_deps(){
ret=$?;[[ $ret -ne 0 ]] && return $ret ret=$?;[[ $ret -ne 0 ]] && return $ret
# Use cnlibs # Use cnlibs
install_cnlibs $1 $2 install_cnlibs $1 $2
ret=$?;[[ $ret -ne 0 ]] && return $ret ret=$?;[[ $ret -ne 0 ]] && return $ret
...@@ -270,4 +270,3 @@ check_install_amf_deps(){ ...@@ -270,4 +270,3 @@ check_install_amf_deps(){
return 0 return 0
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment