File tree 6 files changed +8
-3
lines changed 6 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -1336,8 +1336,9 @@ if(SWIFT_INCLUDE_TOOLS)
1336
1336
set (SWIFT_HOST_LIBRARIES_RPATH "$ORIGIN;$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK} _LIB_SUBDIR}" )
1337
1337
endif ()
1338
1338
1339
+ file (TO_CMAKE_PATH "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE} " swift_syntax_path)
1339
1340
FetchContent_Declare(SwiftSyntax
1340
- SOURCE_DIR "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE } "
1341
+ SOURCE_DIR "${swift_syntax_path } "
1341
1342
)
1342
1343
FetchContent_MakeAvailable(SwiftSyntax)
1343
1344
endfunction ()
Original file line number Diff line number Diff line change @@ -208,6 +208,7 @@ normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_UNICODE_DATA)
208
208
normalize_boolean_spelling(SWIFT_ENABLE_DISPATCH)
209
209
normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_OBJC_INTEROP)
210
210
normalize_boolean_spelling(SWIFT_ENABLE_BACKTRACING)
211
+ normalize_boolean_spelling(SWIFT_BUILD_SWIFT_SYNTAX)
211
212
is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE} " SWIFT_OPTIMIZED)
212
213
213
214
# Get 'SWIFT_HOST_SDKROOT' for lit.site.cfg.in
Original file line number Diff line number Diff line change 12
12
// RUN: %S/Inputs/syntax_macro_definitions.swift \
13
13
// RUN: -g -no-toolchain-stdlib-rpath
14
14
15
- // RUN: SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
15
+ // RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
16
16
// RUN: -typecheck -verify \
17
17
// RUN: -swift-version 5 -enable-experimental-feature ExtensionMacros \
18
18
// RUN: -external-plugin-path %t/plugins#%swift-plugin-server \
Original file line number Diff line number Diff line change 20
20
// RUN: %S/Inputs/evil_macro_definitions.swift \
21
21
// RUN: -g -no-toolchain-stdlib-rpath
22
22
23
- // RUN: SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
23
+ // RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
24
24
// RUN: -typecheck -verify \
25
25
// RUN: -swift-version 5 -enable-experimental-feature Macros \
26
26
// RUN: -external-plugin-path %t/plugins#%swift-plugin-server \
Original file line number Diff line number Diff line change @@ -252,6 +252,7 @@ cmake ^
252
252
-D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
253
253
-D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
254
254
-D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
255
+ -D SWIFT_BUILD_SWIFT_SYNTAX=YES ^
255
256
256
257
-D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=" %SourceRoot% \swift" ^
257
258
-D LLVM_EXTERNAL_CMARK_SOURCE_DIR=" %SourceRoot% \cmark" ^
Original file line number Diff line number Diff line change @@ -274,6 +274,7 @@ cmake^
274
274
-DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
275
275
-DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
276
276
-DSWIFT_LIT_ARGS=" --time-tests" ^
277
+ -DSWIFT_BUILD_SWIFT_SYNTAX=YES ^
277
278
-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH=%source_root% \swift-syntax^
278
279
-S " %source_root% \swift" %exitOnError%
279
280
@@ -318,6 +319,7 @@ cmake^
318
319
-DLLDB_DISABLE_PYTHON=YES^
319
320
-DLLDB_INCLUDE_TESTS:BOOL=NO^
320
321
-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
322
+ -DSWIFT_BUILD_SWIFT_SYNTAX=YES ^
321
323
-S " %source_root% \llvm-project\lldb" %exitOnError%
322
324
323
325
cmake --build " %build_root% \lldb" %exitOnError%
You can’t perform that action at this time.
0 commit comments