Skip to content

build: do not search for native LLVM when not building tools #23826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2019
Merged

build: do not search for native LLVM when not building tools #23826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 27 additions & 25 deletions cmake/modules/SwiftSharedCMakeConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,32 +62,34 @@ macro(swift_common_standalone_build_config_llvm product)
set(${product}_NATIVE_LLVM_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
endif()

if(CMAKE_CROSSCOMPILING)
set(LLVM_NATIVE_BUILD_DIR "${LLVM_BINARY_DIR}/NATIVE")
if(NOT EXISTS "${LLVM_NATIVE_BUILD_DIR}")
message(FATAL_ERROR
"Attempting to cross-compile swift standalone but no native LLVM build
found. Please cross-compile LLVM as well.")
endif()

if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
set(HOST_EXECUTABLE_SUFFIX ".exe")
endif()

if(NOT CMAKE_CONFIGURATION_TYPES)
set(LLVM_TABLEGEN_EXE
"${LLVM_NATIVE_BUILD_DIR}/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
if(SWIFT_INCLUDE_TOOLS)
if(CMAKE_CROSSCOMPILING)
set(LLVM_NATIVE_BUILD_DIR "${LLVM_BINARY_DIR}/NATIVE")
if(NOT EXISTS "${LLVM_NATIVE_BUILD_DIR}")
message(FATAL_ERROR
"Attempting to cross-compile swift standalone but no native LLVM build
found. Please cross-compile LLVM as well.")
endif()

if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
set(HOST_EXECUTABLE_SUFFIX ".exe")
endif()

if(NOT CMAKE_CONFIGURATION_TYPES)
set(LLVM_TABLEGEN_EXE
"${LLVM_NATIVE_BUILD_DIR}/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
else()
# NOTE: LLVM NATIVE build is always built Release, as is specified in
# CrossCompile.cmake
set(LLVM_TABLEGEN_EXE
"${LLVM_NATIVE_BUILD_DIR}/Release/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
endif()
else()
# NOTE: LLVM NATIVE build is always built Release, as is specified in
# CrossCompile.cmake
set(LLVM_TABLEGEN_EXE
"${LLVM_NATIVE_BUILD_DIR}/Release/bin/llvm-tblgen${HOST_EXECUTABLE_SUFFIX}")
endif()
else()
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" HINTS ${LLVM_TOOLS_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
if(LLVM_TABLEGEN_EXE STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
message(FATAL_ERROR "Failed to find tablegen in ${LLVM_TOOLS_BINARY_DIR}")
find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" HINTS ${LLVM_TOOLS_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
if(LLVM_TABLEGEN_EXE STREQUAL "LLVM_TABLEGEN_EXE-NOTFOUND")
message(FATAL_ERROR "Failed to find tablegen in ${LLVM_TOOLS_BINARY_DIR}")
endif()
endif()
endif()

Expand Down