Skip to content

Revert "build: don't link C++ runtime on android" #2419

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
Jul 18, 2019
Merged

Revert "build: don't link C++ runtime on android" #2419

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
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Windows)
set(WORKAROUND_SR9138 -Xlinker;-ignore:4049;-Xlinker;-ignore:4217)
endif()

if(CMAKE_SYSTEM_NAME STREQUAL Android)
set(WORKAROUND_PR26110 -Xclang-linker -nostdlib++)
endif()

# NOTE(compnerd) this is a horrible hack to work around the fact that we do not
# have a proper library target for Foundation which can link against the
# CoreFoundation target. When we gain proper CMake support for Swift, we should
Expand Down Expand Up @@ -288,7 +284,6 @@ add_swift_library(Foundation
$<$<PLATFORM_ID:Windows>:-lShell32>
$<$<PLATFORM_ID:Windows>:-lpathcch>
$<$<PLATFORM_ID:Windows>:$<TARGET_OBJECTS:CoreFoundationResources>>
${WORKAROUND_PR26110}
SWIFT_FLAGS
-Xcc -F${CMAKE_CURRENT_BINARY_DIR}
-DDEPLOYMENT_RUNTIME_SWIFT
Expand Down Expand Up @@ -353,7 +348,6 @@ add_swift_library(FoundationNetworking
${Foundation_RPATH}
${WORKAROUND_SR9138}
${WORKAROUND_SR9995}
${WORKAROUND_PR26110}
SWIFT_FLAGS
-DDEPLOYMENT_RUNTIME_SWIFT
-DNS_BUILDING_FOUNDATION_NETWORKING
Expand Down