Skip to content

Commit f61489d

Browse files
committed
fix
1 parent 551d557 commit f61489d

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

cmake_modules/BuildUtils.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ function(add_paimon_lib LIB_NAME)
179179
PUBLIC "$<BUILD_INTERFACE:paimon_sanitizer_flags>")
180180

181181
if(NOT APPLE)
182-
target_link_options(${LIB_NAME}_shared
183-
PRIVATE
184-
-Wl,--exclude-libs,ALL
185-
-Wl,-Bsymbolic
186-
-Wl,-z,defs
187-
-Wl,--gc-sections)
182+
set(SHARED_LINK_OPTIONS -Wl,--exclude-libs,ALL -Wl,-Bsymbolic
183+
-Wl,--gc-sections)
184+
if(NOT PAIMON_USE_ASAN AND NOT PAIMON_USE_UBSAN)
185+
list(APPEND SHARED_LINK_OPTIONS -Wl,-z,defs)
186+
endif()
187+
target_link_options(${LIB_NAME}_shared PRIVATE ${SHARED_LINK_OPTIONS})
188188
endif()
189189

190190
install(TARGETS ${LIB_NAME}_shared ${INSTALL_IS_OPTIONAL}

cmake_modules/san-config.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ endif()
2525

2626
if(PAIMON_USE_UBSAN)
2727
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
28-
target_compile_options(paimon_sanitizer_flags INTERFACE -fsanitize=undefined
29-
-fno-sanitize=vptr
30-
-fno-omit-frame-pointer)
28+
target_compile_options(paimon_sanitizer_flags
29+
INTERFACE -fsanitize=undefined -fno-sanitize=vptr
30+
-fno-omit-frame-pointer)
3131
target_link_options(paimon_sanitizer_flags INTERFACE -fsanitize=undefined)
3232
message(STATUS "Undefined Behavior Sanitizer enabled")
3333
else()

src/paimon/common/utils/field_type_utils_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ TEST(FieldTypeUtilsTest, FieldTypeToString) {
123123
ASSERT_EQ(FieldTypeUtils::FieldTypeToString(FieldType::STRUCT), "STRUCT");
124124

125125
// Test UNKNOWN type
126-
auto unknown_type = static_cast<FieldType>(999);
127-
ASSERT_EQ(FieldTypeUtils::FieldTypeToString(unknown_type), "UNKNOWN, type id:999");
126+
auto unknown_type = static_cast<FieldType>(128);
127+
ASSERT_EQ(FieldTypeUtils::FieldTypeToString(unknown_type), "UNKNOWN, type id:128");
128128
}
129129

130130
} // namespace paimon::test

0 commit comments

Comments
 (0)