Skip to content

[k2] fix flex libc++ usage #1475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrophysik merged 3 commits into from
Dec 2, 2025
Merged

[k2] fix flex libc++ usage #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcaa677
small fix
astrophysik Dec 2, 2025
ab201bf
add doc comment
astrophysik Dec 2, 2025
535ac68
rename
astrophysik Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions flex/flex.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@ vk_add_library_no_pic(flex-data-src-no-pic OBJECT ${FLEX_SOURCES})
add_dependencies(flex-data-src-no-pic flex-data)

if (COMPILE_RUNTIME_LIGHT)
target_compile_options(flex-data-src-pic PUBLIC -stdlib=libc++ ${RUNTIME_LIGHT_VISIBILITY})
target_link_options(flex-data-src-pic PUBLIC -stdlib=libc++)
# A new pic library needs to be added because it uses libc++.
# vkext is not ready to use a library with libc++.
vk_add_library_pic(flex-libcpp-data-src-pic OBJECT ${FLEX_SOURCES})
add_dependencies(flex-libcpp-data-src-pic flex-data)

target_compile_options(flex-libcpp-data-src-pic PUBLIC -stdlib=libc++ ${RUNTIME_LIGHT_VISIBILITY})
target_link_options(flex-libcpp-data-src-pic PUBLIC -stdlib=libc++)
endif()

vk_add_library_pic(flex_data_shared-pic SHARED $<TARGET_OBJECTS:flex-data-src-pic>)
Expand Down
2 changes: 1 addition & 1 deletion runtime-light/runtime-light.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ set(RUNTIME_LIGHT_LINK_LIBS "${KPHP_TIMELIB_PIC_LIBRARIES} ${PCRE2_PIC_LIBRARIES
vk_add_library_pic(kphp-light-runtime-pic STATIC)
target_compile_options(kphp-light-runtime-pic PUBLIC ${RUNTIME_LIGHT_COMPILE_FLAGS})
target_link_options(kphp-light-runtime-pic PUBLIC ${RUNTIME_LIGHT_LINK_FLAGS})
target_link_libraries(kphp-light-runtime-pic PUBLIC vk::pic::flex-data-src vk::pic::light-common vk::pic::unicode vk::pic::runtime-light vk::pic::runtime-common)
target_link_libraries(kphp-light-runtime-pic PUBLIC vk::pic::flex-libcpp-data-src-pic vk::pic::light-common vk::pic::unicode vk::pic::runtime-light vk::pic::runtime-common)

set_target_properties(kphp-light-runtime-pic PROPERTIES LIBRARY_OUTPUT_NAME libkphp-light-runtime.a)

Expand Down
Loading