Skip to content

Commit 5310ee0

Browse files
authored
Merge pull request swiftlang#30122 from compnerd/cartilege
build: remove reference to `handle_swift_sources` in C++ path
2 parents 61be64a + b40bd3e commit 5310ee0

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -895,30 +895,13 @@ function(_add_swift_host_executable_single name)
895895
LINK_LIBRARIES_VAR_NAME link_libraries
896896
LIBRARY_SEARCH_DIRECTORIES_VAR_NAME library_search_directories)
897897

898-
handle_swift_sources(
899-
dependency_target
900-
unused_module_dependency_target
901-
unused_sib_dependency_target
902-
unused_sibopt_dependency_target
903-
unused_sibgen_dependency_target
904-
SWIFTEXE_SINGLE_SOURCES SWIFTEXE_SINGLE_EXTERNAL_SOURCES ${name}
905-
DEPENDS
906-
${SWIFTEXE_SINGLE_DEPENDS}
907-
MODULE_NAME ${name}
908-
SDK ${SWIFTEXE_SINGLE_SDK}
909-
ARCHITECTURE ${SWIFTEXE_SINGLE_ARCHITECTURE}
910-
COMPILE_FLAGS ${SWIFTEXE_SINGLE_COMPILE_FLAGS}
911-
IS_MAIN)
912-
add_swift_source_group("${SWIFTEXE_SINGLE_EXTERNAL_SOURCES}")
913-
914898
add_executable(${name}
915899
${SWIFTEXE_SINGLE_SOURCES}
916900
${SWIFTEXE_SINGLE_EXTERNAL_SOURCES})
917901

918902
add_dependencies_multiple_targets(
919903
TARGETS "${name}"
920904
DEPENDS
921-
${dependency_target}
922905
${LLVM_COMMON_DEPENDS}
923906
${SWIFTEXE_SINGLE_DEPENDS})
924907
llvm_update_compile_flags("${name}")
@@ -960,17 +943,6 @@ function(_add_swift_host_executable_single name)
960943

961944
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})
962945

963-
# NOTE(compnerd) use the C linker language to invoke `clang` rather than
964-
# `clang++` as we explicitly link against the C++ runtime. We were previously
965-
# actually passing `-nostdlib++` to avoid the C++ runtime linkage.
966-
if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID)
967-
set_property(TARGET "${name}" PROPERTY
968-
LINKER_LANGUAGE "C")
969-
else()
970-
set_property(TARGET "${name}" PROPERTY
971-
LINKER_LANGUAGE "CXX")
972-
endif()
973-
974946
set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
975947
endfunction()
976948

0 commit comments

Comments
 (0)