Skip to content

Commit bd3bc93

Browse files
committed
Fix unified builds.
1 parent d670008 commit bd3bc93

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

cmake/modules/SwiftSharedCMakeConfig.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ macro(swift_common_unified_build_config product)
203203
set(${product}_NATIVE_LLVM_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
204204
set(${product}_NATIVE_CLANG_TOOLS_PATH "${CMAKE_BINARY_DIR}/bin")
205205
set(LLVM_PACKAGE_VERSION ${PACKAGE_VERSION})
206+
set(SWIFT_TABLEGEN_EXE llvm-tblgen)
206207

207208
# If cmark was checked out into tools/cmark, expect to build it as
208209
# part of the unified build.
@@ -228,6 +229,8 @@ macro(swift_common_unified_build_config product)
228229
"${CMARK_MAIN_INCLUDE_DIR}"
229230
"${CMARK_BUILD_INCLUDE_DIR}")
230231

232+
include(AddSwiftTableGen) # This imports TableGen from LLVM.
233+
231234
check_cxx_compiler_flag("-Werror -Wnested-anon-types" CXX_SUPPORTS_NO_NESTED_ANON_TYPES_FLAG)
232235
if(CXX_SUPPORTS_NO_NESTED_ANON_TYPES_FLAG)
233236
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-nested-anon-types")

0 commit comments

Comments
 (0)