@@ -1196,28 +1196,27 @@ function(add_swift_library name)
1196
1196
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS} "
1197
1197
)
1198
1198
1199
- if (NOT SWIFTLIB_OBJECT_LIBRARY )
1199
+ # Add dependencies on the (not-yet-created) custom lipo target.
1200
+ foreach (DEP ${SWIFTLIB_LINK_LIBRARIES} )
1201
+ if (NOT "${DEP} " STREQUAL "icucore" )
1202
+ add_dependencies (${VARIANT_NAME}
1203
+ "${DEP} -${SWIFT_SDK_${sdk} _LIB_SUBDIR}" )
1204
+ message ("${VARIANT_NAME} ${DEP} -${SWIFT_SDK_${sdk} _LIB_SUBDIR}" )
1205
+ endif ()
1206
+ endforeach ()
1207
+
1208
+ if (SWIFT_BUILD_STATIC_STDLIB AND SWIFTLIB_IS_STDLIB )
1200
1209
# Add dependencies on the (not-yet-created) custom lipo target.
1201
1210
foreach (DEP ${SWIFTLIB_LINK_LIBRARIES} )
1202
1211
if (NOT "${DEP} " STREQUAL "icucore" )
1203
- add_dependencies (${VARIANT_NAME}
1204
- "${DEP} -${SWIFT_SDK_${sdk} _LIB_SUBDIR}" )
1212
+ add_dependencies (" ${VARIANT_NAME} -static"
1213
+ "${DEP} -${SWIFT_SDK_${sdk} _LIB_SUBDIR}-static " )
1205
1214
endif ()
1206
1215
endforeach ()
1207
-
1208
- if (SWIFT_BUILD_STATIC_STDLIB AND SWIFTLIB_IS_STDLIB )
1209
- # Add dependencies on the (not-yet-created) custom lipo target.
1210
- foreach (DEP ${SWIFTLIB_LINK_LIBRARIES} )
1211
- if (NOT "${DEP} " STREQUAL "icucore" )
1212
- add_dependencies ("${VARIANT_NAME} -static"
1213
- "${DEP} -${SWIFT_SDK_${sdk} _LIB_SUBDIR}-static" )
1214
- endif ()
1215
- endforeach ()
1216
- endif ()
1217
-
1218
- # Note this thin library.
1219
- list (APPEND THIN_INPUT_TARGETS ${VARIANT_NAME} )
1220
1216
endif ()
1217
+
1218
+ # Note this thin library.
1219
+ list (APPEND THIN_INPUT_TARGETS ${VARIANT_NAME} )
1221
1220
endforeach ()
1222
1221
1223
1222
if (NOT SWIFTLIB_OBJECT_LIBRARY )
0 commit comments