From bcaa6774a2fffaca397f690997dfa9c7b6b2a9d5 Mon Sep 17 00:00:00 2001 From: Vadim Sadokhov Date: Tue, 2 Dec 2025 12:45:08 +0300 Subject: [PATCH 1/3] small fix --- flex/flex.cmake | 7 +++++-- runtime-light/runtime-light.cmake | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flex/flex.cmake b/flex/flex.cmake index 8a05d2b42a..0d023e2be3 100644 --- a/flex/flex.cmake +++ b/flex/flex.cmake @@ -25,8 +25,11 @@ 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++) + vk_add_library_pic(flex-data-src-libcpp-pic OBJECT ${FLEX_SOURCES}) + add_dependencies(flex-data-src-libcpp-pic flex-data) + + target_compile_options(flex-data-src-libcpp-pic PUBLIC -stdlib=libc++ ${RUNTIME_LIGHT_VISIBILITY}) + target_link_options(flex-data-src-libcpp-pic PUBLIC -stdlib=libc++) endif() vk_add_library_pic(flex_data_shared-pic SHARED $) diff --git a/runtime-light/runtime-light.cmake b/runtime-light/runtime-light.cmake index e03d80bc04..5342db5431 100644 --- a/runtime-light/runtime-light.cmake +++ b/runtime-light/runtime-light.cmake @@ -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-data-src-libcpp 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) From ab201bf990ab67d4235a12dacdad9aacd1820652 Mon Sep 17 00:00:00 2001 From: Vadim Sadokhov Date: Tue, 2 Dec 2025 15:23:29 +0300 Subject: [PATCH 2/3] add doc comment --- flex/flex.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flex/flex.cmake b/flex/flex.cmake index 0d023e2be3..7f0c3dcbdd 100644 --- a/flex/flex.cmake +++ b/flex/flex.cmake @@ -25,6 +25,8 @@ 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) + # 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-data-src-libcpp-pic OBJECT ${FLEX_SOURCES}) add_dependencies(flex-data-src-libcpp-pic flex-data) From 535ac68551805b60a566a0113b9fe39ed32b9198 Mon Sep 17 00:00:00 2001 From: Vadim Sadokhov Date: Tue, 2 Dec 2025 15:38:51 +0300 Subject: [PATCH 3/3] rename --- flex/flex.cmake | 8 ++++---- runtime-light/runtime-light.cmake | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flex/flex.cmake b/flex/flex.cmake index 7f0c3dcbdd..5d24a0d1f9 100644 --- a/flex/flex.cmake +++ b/flex/flex.cmake @@ -27,11 +27,11 @@ add_dependencies(flex-data-src-no-pic flex-data) if (COMPILE_RUNTIME_LIGHT) # 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-data-src-libcpp-pic OBJECT ${FLEX_SOURCES}) - add_dependencies(flex-data-src-libcpp-pic flex-data) + 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-data-src-libcpp-pic PUBLIC -stdlib=libc++ ${RUNTIME_LIGHT_VISIBILITY}) - target_link_options(flex-data-src-libcpp-pic PUBLIC -stdlib=libc++) + 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 $) diff --git a/runtime-light/runtime-light.cmake b/runtime-light/runtime-light.cmake index 5342db5431..45814e6887 100644 --- a/runtime-light/runtime-light.cmake +++ b/runtime-light/runtime-light.cmake @@ -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-libcpp 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)