Skip to content

Commit 19a48ce

Browse files
committed
[Windows] Enable macros in Windows
After FetchContent changes, macros in Windows were disabled.
1 parent e9a183c commit 19a48ce

6 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,9 @@ if(SWIFT_INCLUDE_TOOLS)
13361336
set(SWIFT_HOST_LIBRARIES_RPATH "$ORIGIN;$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
13371337
endif()
13381338

1339+
file(TO_CMAKE_PATH "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE}" swift_syntax_path)
13391340
FetchContent_Declare(SwiftSyntax
1340-
SOURCE_DIR "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE}"
1341+
SOURCE_DIR "${swift_syntax_path}"
13411342
)
13421343
FetchContent_MakeAvailable(SwiftSyntax)
13431344
endfunction()

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_UNICODE_DATA)
208208
normalize_boolean_spelling(SWIFT_ENABLE_DISPATCH)
209209
normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_OBJC_INTEROP)
210210
normalize_boolean_spelling(SWIFT_ENABLE_BACKTRACING)
211+
normalize_boolean_spelling(SWIFT_BUILD_SWIFT_SYNTAX)
211212
is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" SWIFT_OPTIMIZED)
212213

213214
# Get 'SWIFT_HOST_SDKROOT' for lit.site.cfg.in

test/Macros/extension_macro_plugin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// RUN: %S/Inputs/syntax_macro_definitions.swift \
1313
// RUN: -g -no-toolchain-stdlib-rpath
1414

15-
// RUN: SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
15+
// RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
1616
// RUN: -typecheck -verify \
1717
// RUN: -swift-version 5 -enable-experimental-feature ExtensionMacros \
1818
// RUN: -external-plugin-path %t/plugins#%swift-plugin-server \

test/Macros/macro_plugin_server.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// RUN: %S/Inputs/evil_macro_definitions.swift \
2121
// RUN: -g -no-toolchain-stdlib-rpath
2222

23-
// RUN: SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
23+
// RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
2424
// RUN: -typecheck -verify \
2525
// RUN: -swift-version 5 -enable-experimental-feature Macros \
2626
// RUN: -external-plugin-path %t/plugins#%swift-plugin-server \

utils/build-windows-toolchain.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ cmake ^
252252
-D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
253253
-D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
254254
-D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
255+
-D SWIFT_BUILD_SWIFT_SYNTAX=YES ^
255256

256257
-D LLVM_EXTERNAL_SWIFT_SOURCE_DIR="%SourceRoot%\swift" ^
257258
-D LLVM_EXTERNAL_CMARK_SOURCE_DIR="%SourceRoot%\cmark" ^

utils/build-windows.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ cmake^
274274
-DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
275275
-DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
276276
-DSWIFT_LIT_ARGS="--time-tests"^
277+
-DSWIFT_BUILD_SWIFT_SYNTAX=YES ^
277278
-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH=%source_root%\swift-syntax^
278279
-S "%source_root%\swift" %exitOnError%
279280

@@ -318,6 +319,7 @@ cmake^
318319
-DLLDB_DISABLE_PYTHON=YES^
319320
-DLLDB_INCLUDE_TESTS:BOOL=NO^
320321
-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
322+
-DSWIFT_BUILD_SWIFT_SYNTAX=YES ^
321323
-S "%source_root%\llvm-project\lldb" %exitOnError%
322324

323325
cmake --build "%build_root%\lldb" %exitOnError%

0 commit comments

Comments
 (0)