Skip to content

Commit 01298df

Browse files
drexinDougGregor
authored andcommitted
Enable import of _Concurrency by default on Linux
1 parent ca6b695 commit 01298df

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cmake/modules/Libdispatch.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ foreach(sdk ${DISPATCH_SDKS})
101101
# ensure that we strip out the DESTDIR environment
102102
# from the sub-build
103103
${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --target install
104+
COMMAND
105+
${CMAKE_COMMAND} -E copy
106+
<INSTALL_DIR>/${LIBDISPATCH_RUNTIME_DIR}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}dispatch${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
107+
${SWIFTLIB_DIR}/${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}dispatch${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
108+
COMMAND
109+
${CMAKE_COMMAND} -E copy
110+
<INSTALL_DIR>/${LIBDISPATCH_RUNTIME_DIR}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}BlocksRuntime${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
111+
${SWIFTLIB_DIR}/${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}/${SWIFT_SDK_${sdk}_SHARED_LIBRARY_PREFIX}BlocksRuntime${SWIFT_SDK_${sdk}_SHARED_LIBRARY_SUFFIX}
104112
STEP_TARGETS
105113
install
106114
BUILD_BYPRODUCTS

lib/Frontend/Frontend.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,8 @@ static bool shouldImportConcurrencyByDefault(const llvm::Triple &target) {
759759
return true;
760760
if (target.isOSWindows())
761761
return true;
762+
if (target.isOSLinux())
763+
return true;
762764
return false;
763765
}
764766

0 commit comments

Comments
 (0)