Skip to content

Commit dad3599

Browse files
[wasm] Revert stdlib/public/runtime/CMakeLists.txt around inspection object
1 parent 0582890 commit dad3599

File tree

1 file changed

+5
-42
lines changed

1 file changed

+5
-42
lines changed

stdlib/public/runtime/CMakeLists.txt

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ set(swift_runtime_library_compile_flags ${swift_runtime_compile_flags})
102102
list(APPEND swift_runtime_library_compile_flags -DswiftCore_EXPORTS)
103103
list(APPEND swift_runtime_library_compile_flags -I${SWIFT_SOURCE_DIR}/stdlib/include/llvm/Support -I${SWIFT_SOURCE_DIR}/include)
104104

105-
macro(add_image_inspection_shared sdk primary_arch inspection_file linkfile_src)
105+
set(sdk "${SWIFT_HOST_VARIANT_SDK}")
106+
if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
106107
set(static_binary_lnk_file_list)
107108
string(TOLOWER "${sdk}" lowercase_sdk)
108109

@@ -111,57 +112,19 @@ macro(add_image_inspection_shared sdk primary_arch inspection_file linkfile_src)
111112
add_custom_command_target(swift_static_binary_${sdk}_args
112113
COMMAND
113114
"${CMAKE_COMMAND}" -E copy
114-
"${linkfile_src}"
115+
"${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk"
115116
"${SWIFTSTATICLIB_DIR}/${linkfile}"
116117
OUTPUT
117118
"${SWIFTSTATICLIB_DIR}/${linkfile}"
118119
DEPENDS
119-
"${linkfile_src}")
120+
"${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk")
120121

121122
list(APPEND static_binary_lnk_file_list ${swift_static_binary_${sdk}_args})
122123
swift_install_in_component(FILES "${SWIFTSTATICLIB_DIR}/${linkfile}"
123124
DESTINATION "lib/swift_static/${lowercase_sdk}"
124125
COMPONENT stdlib)
125-
endmacro()
126-
127-
set(is_image_inspection_required)
128-
foreach(sdk IN LISTS SWIFT_SDKS)
129-
set(image_inspection_shared_sdk)
130-
set(primary_arch)
131-
set(image_inspection_shared_file)
132-
set(linkfile_src)
133-
134-
if("${SWIFT_SDK_${sdk}_OBJECT_FORMAT}" STREQUAL "ELF")
135-
list(APPEND ELFISH_SDKS ${sdk})
136-
set(linkfile_src "${SWIFT_SOURCE_DIR}/utils/static-executable-args.lnk")
137-
elseif("${SWIFT_SDK_${sdk}_OBJECT_FORMAT}" STREQUAL "WASM")
138-
set(linkfile_src "${SWIFT_SOURCE_DIR}/utils/webassembly/static-executable-args.lnk")
139-
endif()
140-
141-
if(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "LINUX")
142-
set(image_inspection_shared_sdk "${sdk}")
143-
set(image_inspection_shared_file ImageInspectionELF.cpp)
144-
elseif(SWIFT_BUILD_STATIC_STDLIB AND "${sdk}" STREQUAL "WASI")
145-
set(image_inspection_shared_sdk "${sdk}")
146-
set(image_inspection_shared_file ImageInspectionWasm.cpp)
147-
# Set default arch
148-
set(primary_arch "wasm32")
149-
endif()
150-
151-
if("${sdk}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}")
152-
set(primary_arch ${SWIFT_PRIMARY_VARIANT_ARCH})
153-
endif()
154-
155-
if(NOT "${image_inspection_shared_sdk}" STREQUAL "" AND NOT "${primary_arch}" STREQUAL "")
156-
set(is_image_inspection_required TRUE)
157-
add_image_inspection_shared(${image_inspection_shared_sdk} ${primary_arch} ${image_inspection_shared_file} ${linkfile_src})
158-
endif()
159-
endforeach()
160-
161-
if(is_image_inspection_required)
162-
add_custom_target(static_binary_magic ALL DEPENDS ${static_binary_lnk_file_list})
163-
add_dependencies(stdlib static_binary_magic)
164126
add_dependencies(stdlib ${static_binary_lnk_file_list})
127+
add_custom_target(static_binary_magic ALL DEPENDS ${static_binary_lnk_file_list})
165128
endif()
166129

167130
add_swift_target_library(swiftRuntime OBJECT_LIBRARY

0 commit comments

Comments
 (0)