Skip to content
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

Jump to bottom

Add Fuchsia OS support #12955

Closed
wants to merge 12 commits into from
Closed

Add Fuchsia OS support #12955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d7e88f
Add LLD linker option to build-script
zbowling Nov 16, 2017
41e58b1
Fix multi-arch cross-compiling
zbowling Nov 28, 2017
7f5aa2e
remove concept of swiftImageInspectionStatic/Shared libraries
zbowling Dec 5, 2017
43ee2db
Add extra-stdlib-deployment-targets to build-util
zbowling Nov 28, 2017
636252a
Define _GNU_SOURCE when importing glibc on Fuchisa
zbowling Nov 28, 2017
252eab1
Add Fuchsia OS Support
zbowling Nov 16, 2017
d0fe0e6
Cleanup trailing whitespace
zbowling Nov 16, 2017
6058ffa
fix Fuchsia changes after merge
zbowling Dec 6, 2017
6f4f052
Use Fuchsia platform libc modulemap for Glibc
zbowling Dec 12, 2017
e3438e4
Install both static and shared libs
zbowling Dec 12, 2017
85bce8d
add missing arg for Foundation prefix
zbowling Jan 11, 2018
eaf0b52
Fix spacing
zbowling Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 58 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -181,7 +181,32 @@ set(SWIFT_ANDROID_DEPLOY_DEVICE_PATH "" CACHE STRING
"Path on an Android device where build products will be pushed. These are used when running the test suite against the device")

#
# User-configurable ICU specific options for Android, FreeBSD, Linux and Haiku.
# User-configurable Fuchsia specific options
#

set(SWIFT_FUCHSIA_AARCH64_SYSROOT "" CACHE STRING
"Path to a Fuchsia zircon aarch64 sysroot directory")

set(SWIFT_FUCHSIA_X86_64_SYSROOT "" CACHE STRING
"Path to a Fuchsia zircon x86_64 sysroot directory")

set(SWIFT_FUCHSIA_AARCH64_LIBS "" CACHE STRING
"Path to a Fuchsia aarch64 shared libs directory")

set(SWIFT_FUCHSIA_X86_64_LIBS "" CACHE STRING
"Path to a Fuchsia x86_64 shared libs directory")

set(SWIFT_FUCHSIA_ICU_UC_INCLUDE "" CACHE STRING
"Path to a directory containing Fuchsia's ICU common headers")

set(SWIFT_FUCHSIA_ICU_I18N_INCLUDE "" CACHE STRING
"Path to a directory containing Fuchsia's ICU i18n headers")

set(SWIFT_FUCHSIA_TOOLCHAIN_PATH "" CACHE STRING
"Path to a directory containing a Fuchsia clang toolchain")

#
# User-configurable ICU specific options for non-Darwin SDKs.
#

foreach(sdk ANDROID;FREEBSD;LINUX;WINDOWS;HAIKU)
Expand Down Expand Up @@ -736,10 +761,10 @@ if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")

set(SWIFT_ANDROID_PREBUILT_PATH
"${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_suffix}")

# Resolve the correct linker based on the file name of CMAKE_LINKER (being 'ld' or 'ld.gold' the options)
get_filename_component(SWIFT_ANDROID_LINKER_NAME "${CMAKE_LINKER}" NAME)
set(SWIFT_SDK_ANDROID_ARCH_armv7_LINKER
set(SWIFT_SDK_ANDROID_ARCH_armv7_LINKER
"${SWIFT_ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_suffix}/bin/arm-linux-androideabi-${SWIFT_ANDROID_LINKER_NAME}")

configure_sdk_unix(ANDROID "Android" "android" "android" "armv7" "armv7-none-linux-androideabi" "${SWIFT_ANDROID_SDK_PATH}")
Expand All @@ -753,6 +778,34 @@ if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
endif()
endif()

# Should we cross-compile the standard library for Fuchsia
is_sdk_requested(FUCHSIA swift_build_fuchsia)
if(swift_build_fuchsia)
set(fuchsia_archs)

if (NOT SWIFT_FUCHSIA_AARCH64_SYSROOT STREQUAL "")
set(SWIFT_SDK_FUCHSIA_ARCH_aarch64_PATH "${SWIFT_FUCHSIA_AARCH64_SYSROOT}")
list(APPEND fuchsia_archs "aarch64")
endif()
if (NOT SWIFT_FUCHSIA_X86_64_SYSROOT STREQUAL "")
set(SWIFT_SDK_FUCHSIA_ARCH_x86_64_PATH "${SWIFT_FUCHSIA_X86_64_SYSROOT}")
list(APPEND fuchsia_archs "x86_64")
endif()

set(SWIFT_FUCHSIA_ICU_UC "-licuuc")
set(SWIFT_FUCHSIA_ICU_I18N "-licui18n")

configure_sdk_fuchsia(FUCHSIA "Fuchsia" "fuchsia" "fuchsia" "${fuchsia_archs}")

if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"))
message(FATAL_ERROR "A Darwin or Linux host is required to build the Swift runtime for Fuchsia")
elseif(("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT swift_build_osx) OR
("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND NOT swift_build_linux))
set(SWIFT_PRIMARY_VARIANT_SDK_default "FUCHSIA")
set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
endif()
endif()

# Should we cross-compile the standard library for Windows?
is_sdk_requested(WINDOWS swift_build_windows)
if(swift_build_windows AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
Expand Down Expand Up @@ -867,7 +920,7 @@ endif()
###############
#
# We have to include stdlib/ before tools/.
# Do not move add_subdirectory(stdlib) after add_subdirectory(tools)!
# Do not move add_subdirectory(stdlib) after add_subdirectory(tools)!
#
# We must include stdlib/ before tools/ because stdlib/CMakeLists.txt
# declares the swift-stdlib-* set of targets. These targets will then
Expand All @@ -886,7 +939,7 @@ add_subdirectory(stdlib)
if(SWIFT_INCLUDE_TOOLS)
add_subdirectory(include)
add_subdirectory(lib)

# Always include this after including stdlib/!
# Refer to the large comment above the add_subdirectory(stdlib) call.
# https://bugs.swift.org/browse/SR-5975
Expand Down