Skip to content

[android] LINKER_LANGUAGE needs to be applied to executables too. #25523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2019
Merged

[android] LINKER_LANGUAGE needs to be applied to executables too. #25523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2346,6 +2346,17 @@ function(_add_swift_executable_single name)
target_link_libraries("${name}" PRIVATE ${SWIFTEXE_SINGLE_LINK_LIBRARIES})
swift_common_llvm_config("${name}" ${SWIFTEXE_SINGLE_LLVM_LINK_COMPONENTS})

# NOTE(compnerd) use the C linker language to invoke `clang` rather than
# `clang++` as we explicitly link against the C++ runtime. We were previously
# actually passing `-nostdlib++` to avoid the C++ runtime linkage.
if(SWIFTEXE_SINGLE_SDK STREQUAL ANDROID)
set_property(TARGET "${name}" PROPERTY
LINKER_LANGUAGE "C")
else()
set_property(TARGET "${name}" PROPERTY
LINKER_LANGUAGE "CXX")
endif()

set_target_properties(${name} PROPERTIES FOLDER "Swift executables")
endfunction()

Expand Down