File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -25,8 +25,13 @@ vk_add_library_no_pic(flex-data-src-no-pic OBJECT ${FLEX_SOURCES})
2525add_dependencies (flex-data-src-no-pic flex-data )
2626
2727if (COMPILE_RUNTIME_LIGHT)
28- target_compile_options (flex-data-src-pic PUBLIC -stdlib=libc++ ${RUNTIME_LIGHT_VISIBILITY} )
29- target_link_options (flex-data-src-pic PUBLIC -stdlib=libc++ )
28+ # A new pic library needs to be added because it uses libc++.
29+ # vkext is not ready to use a library with libc++.
30+ vk_add_library_pic (flex-libcpp-data-src-pic OBJECT ${FLEX_SOURCES} )
31+ add_dependencies (flex-libcpp-data-src-pic flex-data )
32+
33+ target_compile_options (flex-libcpp-data-src-pic PUBLIC -stdlib=libc++ ${RUNTIME_LIGHT_VISIBILITY} )
34+ target_link_options (flex-libcpp-data-src-pic PUBLIC -stdlib=libc++ )
3035endif ()
3136
3237vk_add_library_pic (flex_data_shared-pic SHARED $<TARGET_OBJECTS :flex -data -src -pic >)
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ set(RUNTIME_LIGHT_LINK_LIBS "${KPHP_TIMELIB_PIC_LIBRARIES} ${PCRE2_PIC_LIBRARIES
6363vk_add_library_pic (kphp-light-runtime-pic STATIC )
6464target_compile_options (kphp-light-runtime-pic PUBLIC ${RUNTIME_LIGHT_COMPILE_FLAGS} )
6565target_link_options (kphp-light-runtime-pic PUBLIC ${RUNTIME_LIGHT_LINK_FLAGS} )
66- 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 )
66+ 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 )
6767
6868set_target_properties (kphp-light-runtime-pic PROPERTIES LIBRARY_OUTPUT_NAME libkphp-light-runtime.a )
6969
You can’t perform that action at this time.
0 commit comments