Merge pull request #77469 from etcwilde/ewilde/stdlib-rebuild-elf-swiftrt-paths

[CMake] Get ELF SwiftRT building

Author: etcwilde

Runtimes/Core/cmake/modules/DefaultSettings.cmake

@@ -24,7 +24,7 @@ if(APPLE)
   set(SwiftCore_ENABLE_REFLECTION_default ON)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
   set(SwiftCore_OBJECT_FORMAT_default "elf")
-elseif(LINUX)
+elseif(LINUX OR ANDROID OR BSD)
   set(SwiftCore_OBJECT_FORMAT_default "elf")
 elseif(WIN32)
   set(SwiftCore_OBJECT_FORMAT_default "coff")

Runtimes/Core/runtime/CMakeLists.txt

@@ -120,6 +120,9 @@ if("${SwiftCore_OBJECT_FORMAT}" STREQUAL "elfx")
   add_library(swiftrt OBJECT SwiftRT-ELF-WASM.cpp)
   target_compile_definitions(swiftrt PRIVATE
     -DSWIFT_ENABLE_BACKTRACING=$<BOOL:${SwiftCore_ENABLE_BACKTRACING}>)
+  target_include_directories(swiftrt PRIVATE
+    "${SwiftCore_SWIFTC_SOURCE_DIR}/include"
+    "${PROJECT_BINARY_DIR}/include")
   target_link_libraries(swiftrt PRIVATE swiftShims)
   install(TARGETS swiftrt DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift")
 elseif("${SwiftCore_OBJECT_FORMAT}" STREQUAL "coffx")