hcq/CM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.1.0 version适配三方库构建路径

Browse Source
This commit is contained in:
zhang_xubo
2022-09-03 15:19:08 +08:00
parent 0d0d5578a6
commit 3d15818637
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/build.sh
View File

@ -74,8 +74,7 @@ function update_dcc_dependency() {
fi
if [ "x${THIRD_BIN_PATH}" != "x" ]; then
local plantform=$(sh ${SCRIPT_PATH}/get_PlatForm_str.sh)
local dccHome="${THIRD_BIN_PATH}/component/${plantform}/dcc"
local dccHome="${THIRD_BIN_PATH}/kernel/component/dcc"
if [ -d "${dccHome}" ]; then
echo "We well get dcc lib from 3rd[${dccHome}]."
@ -98,8 +97,7 @@ function gcc_env() {
export CXX=$(which g++)
return
fi
local plantform=$(sh ${SCRIPT_PATH}/get_PlatForm_str.sh)
export GCCFOLDER=${THIRD}/buildtools/${plantform}/gcc${GCC}/
export GCCFOLDER=${THIRD}/buildtools/gcc${GCC}/
echo "gcc set to 3rd path:[${GCCFOLDER}]!"
export CC=$GCCFOLDER/gcc/bin/gcc
export CXX=$GCCFOLDER/gcc/bin/g++

6
build/cmake/set_thirdparty_path.cmake
View File

@ -27,9 +27,9 @@ else ()
set(3RD_PATH ${DEFAULT_3RD_PATH})
endif ()
set(3RD_DEPENDENCY_ROOT ${3RD_PATH}/dependency/${PLAT_FORM_NAME})
set(3RD_PLATFORM_ROOT ${3RD_PATH}/platform/${PLAT_FORM_NAME})
set(3RD_BUILDTOOLS_ROOT ${3RD_PATH}/buildtools/${PLAT_FORM_NAME})
set(3RD_DEPENDENCY_ROOT ${3RD_PATH}/kernel/dependency)
set(3RD_PLATFORM_ROOT ${3RD_PATH}/kernel/platform)
set(3RD_BUILDTOOLS_ROOT ${3RD_PATH}/kernel/buildtools)
endif ()
message("Using 3rd_library path is [${3RD_PATH}]")

6
build_make.sh
View File

@ -78,8 +78,7 @@ function update_dcc_dependency() {
fi
if [ "x${THIRD_BIN_PATH}" != "x" ]; then
local plantform=$(sh ${SCRIPT_PATH}/build/get_PlatForm_str.sh)
local dccHome="${THIRD_BIN_PATH}/component/${plantform}/dcc"
local dccHome="${THIRD_BIN_PATH}/kernel/component/dcc"
if [ -d "${dccHome}" ]; then
echo "We well get dcc lib from 3rd[${dccHome}]."
@ -102,8 +101,7 @@ function gcc_env() {
export CXX=$(which g++)
return
fi
local plantform=$(sh ${SCRIPT_PATH}/build/get_PlatForm_str.sh)
export GCCFOLDER=${THIRD}/buildtools/${plantform}/gcc${GCC}/
export GCCFOLDER=${THIRD}/buildtools/gcc${GCC}/
echo "gcc set to 3rd path:[${GCCFOLDER}]!"
export CC=$GCCFOLDER/gcc/bin/gcc
export CXX=$GCCFOLDER/gcc/bin/g++

2
src/cm_adapter/cm_etcdapi/Makefile
View File

@ -43,6 +43,6 @@ uninstall:
rm -f '$(DESTDIR)$(libdir)/libetcdapi.a'
librace.a: cm_etcdapi.o
ar -x ${with_3rd}/dependency/$(PLAT_FORM_STR)/etcd/comm/lib/libclientv3.a
ar -x ${with_3rd}/kernel/dependency/etcd/comm/lib/libclientv3.a
ar -crv $@ *.o
mv $@ libetcdapi.a