16
16
#
17
17
function (add_swift_compiler_module module )
18
18
cmake_parse_arguments (ALSM
19
- "ADD_TO_SYNTAXPARSE "
19
+ ""
20
20
""
21
21
"DEPENDS;SOURCES"
22
22
${ARGN} )
@@ -35,7 +35,6 @@ function(add_swift_compiler_module module)
35
35
36
36
set_property (TARGET ${target_name} PROPERTY module_name ${module} )
37
37
set_property (TARGET ${target_name} PROPERTY module_depends ${ALSM_DEPENDS} )
38
- set_property (TARGET ${target_name} PROPERTY add_to_syntaxparse ${ALSM_ADD_TO_SYNTAXPARSE} )
39
38
40
39
get_property (modules GLOBAL PROPERTY swift_compiler_modules )
41
40
set_property (GLOBAL PROPERTY swift_compiler_modules ${modules} ${module} )
@@ -134,16 +133,13 @@ function(add_swift_compiler_modules_library name)
134
133
135
134
set (all_obj_files )
136
135
set (all_module_targets )
137
- set (syntaxparse_obj_files )
138
- set (syntaxparse_module_targets )
139
136
get_property (modules GLOBAL PROPERTY "swift_compiler_modules" )
140
137
foreach (module ${modules} )
141
138
142
139
set (module_target "SwiftModule${module} " )
143
140
get_target_property (module ${module_target} "module_name" )
144
141
get_target_property (sources ${module_target} SOURCES )
145
142
get_target_property (dependencies ${module_target} "module_depends" )
146
- get_target_property (add_to_syntaxparse ${module_target} "add_to_syntaxparse" )
147
143
set (deps, "" )
148
144
if (dependencies )
149
145
foreach (dep_module ${dependencies} )
@@ -163,9 +159,6 @@ function(add_swift_compiler_modules_library name)
163
159
set_property (TARGET ${module_target} PROPERTY "module_file" "${module_file} " )
164
160
165
161
set (all_obj_files ${all_obj_files} ${module_obj_file} )
166
- if (add_to_syntaxparse )
167
- set (syntaxparse_obj_files ${syntaxparse_obj_files} ${module_obj_file} )
168
- endif ()
169
162
set (c_include_paths
170
163
# LLVM modules and headers.
171
164
"${LLVM_MAIN_INCLUDE_DIR} "
@@ -201,9 +194,6 @@ function(add_swift_compiler_modules_library name)
201
194
202
195
set ("${module} _dep_target" ${dep_target} )
203
196
set (all_module_targets ${all_module_targets} ${dep_target} )
204
- if (add_to_syntaxparse )
205
- set (syntaxparse_module_targets ${syntaxparse_module_targets} ${dep_target} )
206
- endif ()
207
197
endforeach ()
208
198
209
199
# Create a static library containing all module object files.
@@ -217,15 +207,6 @@ function(add_swift_compiler_modules_library name)
217
207
add_dependencies (${name} ${all_module_targets} )
218
208
set_target_properties (${name} PROPERTIES LINKER_LANGUAGE CXX )
219
209
set_property (GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${name} )
220
-
221
- if (XCODE )
222
- set (syntaxparse_obj_files force_lib.c ${syntaxparse_obj_files} )
223
- endif ()
224
- add_library ("${name} _SwiftSyntax" STATIC ${syntaxparse_obj_files} )
225
- add_dependencies ("${name} _SwiftSyntax" ${syntaxparse_module_targets} )
226
- set_target_properties ("${name} _SwiftSyntax" PROPERTIES LINKER_LANGUAGE CXX )
227
- set_property (GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS "${name} _SwiftSyntax" )
228
-
229
210
endfunction ()
230
211
231
212
@@ -235,7 +216,6 @@ add_swift_host_library(swiftCompilerStub OBJECT stubs.cpp)
235
216
if (NOT BOOTSTRAPPING_MODE )
236
217
237
218
add_library (swiftCompilerModules ALIAS swiftCompilerStub )
238
- add_library (swiftCompilerModules_SwiftSyntax ALIAS swiftCompilerStub )
239
219
240
220
else ()
241
221
# Note: "Swift" is not added intentionally here, because it would break
0 commit comments