Skip to content

Commit 546b9b6

Browse files
committed
build: remove SWIFT_COMPILE_FLAGS from _add_swift_host_library_single
1 parent 626a1f4 commit 546b9b6

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,6 @@ endfunction()
679679
# [SDK sdk]
680680
# [ARCHITECTURE architecture]
681681
# [LLVM_LINK_COMPONENTS comp1 ...]
682-
# [SWIFT_COMPILE_FLAGS flag1...]
683682
# INSTALL_IN_COMPONENT comp
684683
# source1 [source2 source3 ...])
685684
#
@@ -704,9 +703,6 @@ endfunction()
704703
# LLVM_LINK_COMPONENTS
705704
# LLVM components this library depends on.
706705
#
707-
# SWIFT_COMPILE_FLAGS
708-
# Extra compile flags (Swift).
709-
#
710706
# INSTALL_IN_COMPONENT comp
711707
# The Swift installation component that this library belongs to.
712708
#
@@ -727,8 +723,7 @@ function(_add_swift_host_library_single target name)
727723
SDK)
728724
set(SWIFTLIB_SINGLE_multiple_parameter_options
729725
GYB_SOURCES
730-
LLVM_LINK_COMPONENTS
731-
SWIFT_COMPILE_FLAGS)
726+
LLVM_LINK_COMPONENTS)
732727

733728
cmake_parse_arguments(SWIFTLIB_SINGLE
734729
"${SWIFTLIB_SINGLE_options}"
@@ -800,20 +795,7 @@ function(_add_swift_host_library_single target name)
800795
string(REPLACE swift "" module_name "${name}")
801796

802797
if("${SWIFTLIB_SINGLE_SDK}" STREQUAL "WINDOWS")
803-
if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
804-
swift_windows_get_sdk_vfs_overlay(SWIFTLIB_SINGLE_VFS_OVERLAY)
805-
list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS
806-
-Xcc;-Xclang;-Xcc;-ivfsoverlay;-Xcc;-Xclang;-Xcc;${SWIFTLIB_SINGLE_VFS_OVERLAY})
807-
endif()
808798
swift_windows_include_for_arch(${SWIFTLIB_SINGLE_ARCHITECTURE} SWIFTLIB_INCLUDE)
809-
foreach(directory ${SWIFTLIB_INCLUDE})
810-
list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xcc;-isystem;-Xcc;${directory})
811-
endforeach()
812-
if("${SWIFTLIB_SINGLE_ARCHITECTURE}" MATCHES arm)
813-
list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS -Xcc;-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE)
814-
endif()
815-
list(APPEND SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS
816-
-libc;${SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY})
817799
endif()
818800

819801
handle_swift_sources(
@@ -829,7 +811,6 @@ function(_add_swift_host_library_single target name)
829811
SDK ${SWIFTLIB_SINGLE_SDK}
830812
ARCHITECTURE ${SWIFTLIB_SINGLE_ARCHITECTURE}
831813
MODULE_NAME ${module_name}
832-
COMPILE_FLAGS ${SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS}
833814
${embed_bitcode_arg}
834815
INSTALL_IN_COMPONENT "${SWIFTLIB_SINGLE_INSTALL_IN_COMPONENT}")
835816
add_swift_source_group("${SWIFTLIB_SINGLE_EXTERNAL_SOURCES}")

0 commit comments

Comments
 (0)