Skip to content

Commit 40e5924

Browse files
authored
Merge pull request swiftlang#27814 from JDevlieghere/use-static-bindings
[CMake] Fix the static bindings workflow.
2 parents 9721fd7 + ec21125 commit 40e5924

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

docs/WindowsBuild.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ cmake -G Ninja^
178178
-DClang_DIR="S:/b/llvm/lib/cmake/clang"^
179179
-DSwift_DIR="S:/b/swift/lib/cmake/swift"^
180180
-DCMAKE_BUILD_TYPE=RelWithDebInfo^
181-
-DLLDB_ALLOW_STATIC_BINDINGS=YES^
181+
-DLLDB_USE_STATIC_BINDINGS=YES^
182182
-DLLVM_ENABLE_ASSERTIONS=ON^
183183
-DPYTHON_HOME="%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64"^
184184
S:\lldb

utils/build-script-impl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2454,7 +2454,6 @@ for host in "${ALL_HOSTS[@]}"; do
24542454
-DLLDB_PATH_TO_SWIFT_SOURCE:PATH="${SWIFT_SOURCE_DIR}"
24552455
-DLLDB_IS_BUILDBOT_BUILD:BOOL="${LLDB_IS_BUILDBOT_BUILD}"
24562456
-DLLDB_BUILD_DATE:STRING="\"${LLDB_BUILD_DATE}\""
2457-
-DLLDB_ALLOW_STATIC_BINDINGS:BOOL=1
24582457
-DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})
24592458
-DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}"
24602459
)

utils/build-windows.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ cmake "%source_root%\lldb"^
279279
-DClang_DIR:PATH=%build_root%\llvm\lib\cmake\clang^
280280
-DSwift_DIR:PATH=%build_root%\swift\lib\cmake\swift^
281281
-DLLVM_ENABLE_ASSERTIONS:BOOL=YES^
282-
-DLLDB_ALLOW_STATIC_BINDINGS:BOOL=YES^
282+
-DLLDB_USE_STATIC_BINDINGS:BOOL=YES^
283283
-DPYTHON_HOME:PATH=%PYTHON_HOME%^
284284
-DCMAKE_CXX_FLAGS:STRING="/GS- /Oy"^
285285
-DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^

0 commit comments

Comments
 (0)