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

fix zstd_obj objcopy error in LTO build mode when in low objcopy version

Browse Source
This commit is contained in:
wenxingsen
2023-03-08 14:13:33 +00:00
committed by ob-robot
parent ba782bb0cc
commit b9b64478a7
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Env.cmake
View File

@ -67,6 +67,8 @@ if (ENABLE_EXE_PIE)
set(OB_EXE_LINKER_OPT "-pie")
endif()
set(OB_OBJCOPY_BIN "${DEVTOOLS_DIR}/bin/objcopy")
if (OB_USE_CLANG)
find_program(OB_CC clang
"${DEVTOOLS_DIR}/bin"

2
deps/oblib/src/lib/compress/lz4/CMakeLists.txt vendored
View File

@ -11,7 +11,7 @@ macro(gen_local_lib NAME)
add_custom_command(
OUTPUT ${NAME}
COMMAND ${OB_LD_BIN} -r $<TARGET_OBJECTS:${TGT}> -o ${NAME}
COMMAND objcopy --localize-hidden ${NAME}
COMMAND ${OB_OBJCOPY_BIN} --localize-hidden ${NAME}
DEPENDS ${TGT}
DEPENDS $<TARGET_OBJECTS:${TGT}>
COMMAND_EXPAND_LISTS

2
deps/oblib/src/lib/compress/zstd/CMakeLists.txt vendored
View File

@ -47,7 +47,7 @@ target_link_libraries(zstd_objs PUBLIC oblib_base_base)
add_custom_command(
OUTPUT zstd_objs.o
COMMAND ${OB_LD_BIN} -r $<TARGET_OBJECTS:zstd_objs> -o zstd_objs.tmp.o
COMMAND objcopy --localize-hidden zstd_objs.tmp.o zstd_objs.o
COMMAND ${OB_OBJCOPY_BIN} --localize-hidden zstd_objs.tmp.o zstd_objs.o
DEPENDS zstd_objs
BYPRODUCTS zstd_objs.o
COMMAND_EXPAND_LISTS

2
deps/oblib/src/lib/compress/zstd_1_3_8/CMakeLists.txt vendored
View File

@ -60,7 +60,7 @@ target_link_libraries(zstd_1_3_8_objs PUBLIC oblib_base_base)
add_custom_command(
OUTPUT zstd_1_3_8_objs.o
COMMAND ${OB_LD_BIN} -r $<TARGET_OBJECTS:zstd_1_3_8_objs> -o zstd_1_3_8_objs.tmp.o
COMMAND objcopy --localize-hidden zstd_1_3_8_objs.tmp.o zstd_1_3_8_objs.o
COMMAND ${OB_OBJCOPY_BIN} --localize-hidden zstd_1_3_8_objs.tmp.o zstd_1_3_8_objs.o
DEPENDS zstd_1_3_8_objs
BYPRODUCTS zstd_1_3_8_objs.o
COMMAND_EXPAND_LISTS