Skip to content

Commit f19a5fd

Browse files
committed
Fix handling of multi-defines on Windows
1 parent 37a74f0 commit f19a5fd

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

ci/build.bat

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,18 @@ SET B2_TOOLCXX=toolset=%B2_TOOLSET%
1919

2020
IF DEFINED B2_CXXSTD (SET B2_CXXSTD=cxxstd=%B2_CXXSTD%)
2121
IF DEFINED B2_CXXFLAGS (SET B2_CXXFLAGS=cxxflags=%B2_CXXFLAGS%)
22-
IF DEFINED B2_DEFINES (SET B2_DEFINES=define=%B2_DEFINES%)
22+
IF DEFINED B2_DEFINES (
23+
SETLOCAL EnableDelayedExpansion
24+
25+
SET "_B2_DEFINES="
26+
FOR %%A IN (%B2_DEFINES%) DO (
27+
SET "_B2_DEFINES=!_B2_DEFINES! define=%%~A"
28+
)
29+
30+
SET "_B2_DEFINES=!_B2_DEFINES:~1!"
31+
32+
ENDLOCAL & SET "B2_DEFINES=%_B2_DEFINES%"
33+
)
2334
IF DEFINED B2_INCLUDE (SET B2_INCLUDE=include=%B2_INCLUDE%)
2435
IF DEFINED B2_ADDRESS_MODEL (SET B2_ADDRESS_MODEL=address-model=%B2_ADDRESS_MODEL%)
2536
IF DEFINED B2_TARGET_OS (SET B2_TARGET_OS=target-os=%B2_TARGET_OS%)

0 commit comments

Comments
 (0)