Skip to content

Commit f6c2532

Browse files
committed
[cmake] Remove standalone clang config code for building clang separate from llvm/swift.
We do not support this now. When we do, code can be added back. rdar://26154980
1 parent 7f51163 commit f6c2532

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

cmake/modules/SwiftSharedCMakeConfig.cmake

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,14 @@ macro(swift_common_standalone_build_config_clang product is_cross_compiling)
120120

121121
if(NOT EXISTS "${${product}_PATH_TO_CLANG_SOURCE}/include/clang/AST/Decl.h")
122122
message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_SOURCE to the root directory of Clang's source code.")
123-
else()
124-
get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
125-
ABSOLUTE)
126123
endif()
124+
get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
125+
ABSOLUTE)
127126

128-
if(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/include/clang/Basic/Version.inc")
129-
set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/include")
130-
elseif(EXISTS "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include/clang/Basic/Version.inc")
131-
set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include")
132-
else()
127+
if(NOT EXISTS "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include/clang/Basic/Version.inc")
133128
message(FATAL_ERROR "Please set ${product}_PATH_TO_CLANG_BUILD to a directory containing a Clang build.")
134129
endif()
135-
if(CLANG_MAIN_INCLUDE_DIR)
136-
get_filename_component(CLANG_MAIN_SRC_DIR ${${product}_PATH_TO_CLANG_SOURCE}
137-
ABSOLUTE)
138-
endif()
130+
set(CLANG_BUILD_INCLUDE_DIR "${${product}_PATH_TO_CLANG_BUILD}/tools/clang/include")
139131

140132
if (NOT ${is_cross_compiling})
141133
set(${product}_NATIVE_CLANG_TOOLS_PATH "${PATH_TO_LLVM_TOOLS_BINARY_DIR}")

0 commit comments

Comments
 (0)