Skip to content

Commit ec21125

Browse files
committed
[CMake] Fix the static bindings workflow.
Rename LLDB_ALLOW_STATIC_BINDINGS to LLDB_USE_STATIC_BINDINGS and make LLDB use the static bindings unconditionally when it's set. The current variable is opaque because it allows LLDB to use the static bindings, but only if SWIG is not found. If an incompatible version of swig is found, it reports a fatal error. This serves no purpose other than to confuse the user. The corresponding LLDB patch simplifies things and makes the variable do what you expect. When enabled, LLDB uses the static bindings. When disabled, we try to generate them with SWIG. This patch modifies the build scripts to pass the new variable.
1 parent 437e065 commit ec21125

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
@@ -183,7 +183,7 @@ cmake -G Ninja^
183183
-DClang_DIR="S:/b/llvm/lib/cmake/clang"^
184184
-DSwift_DIR="S:/b/swift/lib/cmake/swift"^
185185
-DCMAKE_BUILD_TYPE=RelWithDebInfo^
186-
-DLLDB_ALLOW_STATIC_BINDINGS=YES^
186+
-DLLDB_USE_STATIC_BINDINGS=YES^
187187
-DLLVM_ENABLE_ASSERTIONS=ON^
188188
-DPYTHON_HOME="%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64"^
189189
S:\lldb

utils/build-script-impl

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

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)