Skip to content

Commit 2205d2a

Browse files
[cmake] Revert standalone WASILibc configuration
1 parent 37138e4 commit 2205d2a

File tree

1 file changed

+0
-86
lines changed

1 file changed

+0
-86
lines changed

stdlib/public/Platform/CMakeLists.txt

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -114,92 +114,6 @@ add_swift_target_library(swiftWASILibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SD
114114
INSTALL_IN_COMPONENT sdk-overlay
115115
DEPENDS glibc_modulemap)
116116

117-
118-
if(WASI IN_LIST SWIFT_SDKS)
119-
set(arch_subdir "${SWIFT_SDK_WASI_LIB_SUBDIR}/wasm32")
120-
set(module_dir "${SWIFTLIB_DIR}/${arch_subdir}")
121-
set(module_dir_static "${SWIFTSTATICLIB_DIR}/${arch_subdir}")
122-
set(wasi_libc_modulemap_out "${module_dir}/wasi.modulemap")
123-
set(wasi_libc_modulemap_out_static "${module_dir_static}/wasi.modulemap")
124-
set(wasi_libc_modulemap_target_list)
125-
handle_gyb_source_single(wasi_libc_modulemap_target
126-
SOURCE "wasi.modulemap.gyb"
127-
OUTPUT "${wasi_libc_modulemap_out}"
128-
FLAGS "-DLIBC_INCLUDE_PATH=${SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY}"
129-
"-DLIBC_ARCH_INCLUDE_PATH=${SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY}")
130-
list(APPEND wasi_libc_modulemap_target_list ${wasi_libc_modulemap_target})
131-
132-
add_custom_command_target(
133-
copy_wasi_libc_modulemap_static
134-
COMMAND
135-
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
136-
COMMAND
137-
"${CMAKE_COMMAND}" "-E" "copy" ${wasi_libc_modulemap_out} ${wasi_libc_modulemap_out_static}
138-
OUTPUT ${wasi_libc_modulemap_out_static}
139-
DEPENDS
140-
"${wasi_libc_modulemap_target}"
141-
COMMENT "Copying WASILlibc modulemap to static resources")
142-
143-
list(APPEND wasi_libc_modulemap_target_list ${copy_wasi_libc_modulemap_static})
144-
145-
set(wasi_libc_header_out "${module_dir}/SwiftWASILibc.h")
146-
set(wasi_libc_header_out_static "${module_dir_static}/SwiftWASILibc.h")
147-
handle_gyb_source_single(wasi_libc_header_target
148-
SOURCE "SwiftWASILibc.h.gyb"
149-
OUTPUT "${wasi_libc_header_out}"
150-
FLAGS "-DCMAKE_SDK=${sdk}")
151-
list(APPEND wasi_libc_modulemap_target_list ${wasi_libc_header_target})
152-
153-
add_custom_command_target(
154-
copy_wasi_libc_header_static
155-
COMMAND
156-
"${CMAKE_COMMAND}" "-E" "make_directory" ${module_dir_static}
157-
COMMAND
158-
"${CMAKE_COMMAND}" "-E" "copy" ${wasi_libc_header_out} ${wasi_libc_header_out_static}
159-
OUTPUT ${wasi_libc_header_out_static}
160-
DEPENDS
161-
"${wasi_libc_header_target}"
162-
COMMENT "Copying WASILlibc header to static resources")
163-
list(APPEND wasi_libc_modulemap_target_list ${copy_wasi_libc_header_static})
164-
165-
add_swift_target_library(swiftWASILibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
166-
${swift_platform_sources}
167-
POSIXError.swift
168-
169-
GYB_SOURCES
170-
${swift_platform_gyb_sources}
171-
WASI.swift.gyb
172-
173-
SWIFT_COMPILE_FLAGS
174-
${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}
175-
${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
176-
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
177-
TARGET_SDKS WASI
178-
INSTALL_IN_COMPONENT sdk-overlay
179-
DEPENDS ${wasi_libc_modulemap_target_list})
180-
181-
swift_install_in_component(FILES "${wasi_libc_modulemap_out}"
182-
DESTINATION "lib/swift/${arch_subdir}"
183-
COMPONENT sdk-overlay)
184-
185-
swift_install_in_component(FILES "${wasi_libc_modulemap_out}"
186-
DESTINATION "lib/swift_static/${arch_subdir}"
187-
COMPONENT sdk-overlay)
188-
189-
swift_install_in_component(FILES "${wasi_libc_header_out}"
190-
DESTINATION "lib/swift/${arch_subdir}"
191-
COMPONENT sdk-overlay)
192-
193-
swift_install_in_component(FILES "${wasi_libc_header_out}"
194-
DESTINATION "lib/swift_static/${arch_subdir}"
195-
COMPONENT sdk-overlay)
196-
197-
add_custom_target(wasi_libc_modulemap
198-
DEPENDS ${wasi_libc_modulemap_target_list})
199-
set_property(TARGET wasi_libc_modulemap PROPERTY FOLDER "Miscellaneous")
200-
add_dependencies(sdk-overlay wasi_libc_modulemap)
201-
endif()
202-
203117
add_swift_target_library(swiftCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
204118
ucrt.swift
205119
${swift_platform_sources}

0 commit comments

Comments
 (0)