Skip to content

Commit 522f97d

Browse files
committed
build: simplify the blocks handling
`-fblocks` is a core driver option now, so it can be used with both the GCC style driver as well as the cl style driver. Simplify the logic for the handling of this option.
1 parent 6f67481 commit 522f97d

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

cmake/modules/AddSwiftBlocksSupport.cmake

Lines changed: 0 additions & 19 deletions
This file was deleted.

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
include(AddSwiftBlocksSupport)
21

32
function(add_sourcekit_symbol_exports target_name export_file)
43
# Makefile.rules contains special cases for different platforms.
@@ -75,10 +74,9 @@ function(add_sourcekit_default_compiler_flags target)
7574

7675
# Set compilation and link flags.
7776
set_property(TARGET "${target}" APPEND_STRING PROPERTY
78-
COMPILE_FLAGS " ${c_compile_flags}")
77+
COMPILE_FLAGS " ${c_compile_flags} -fblocks")
7978
set_property(TARGET "${target}" APPEND_STRING PROPERTY
8079
LINK_FLAGS " ${link_flags}")
81-
swift_add_blocks_support("${target}")
8280
endfunction()
8381

8482
# Add a new SourceKit library.

0 commit comments

Comments
 (0)