This is an archive of the discontinued LLVM Phabricator instance.

Differential D83414

Unbreak Clang standalone build.
AbandonedPublic

Authored by michele.scandale on Jul 8 2020, 11:53 AM.

Details

Reviewers
clementval
simon_tatham
chandlerc
jdoerfert
Summary

Having the omp_gen dependency added unconditionally to Clang libraries
breaks the Clang standalone build. This dependency should be added only
if CLANG_BUILT_STANDALONE is false, similarly to the intrinsics_gen
case.
Moreover the C++ standard must be set properly as well.

Diff Detail

Unit TestsFailed

TimeTest
80 mswindows > LLVM.Analysis/ScalarEvolution::Unknown Unit Message ("")
140 mswindows > LLVM.Analysis/ScalarEvolution::Unknown Unit Message ("")
140 mswindows > LLVM.CodeGen/Thumb2::Unknown Unit Message ("")
60 mswindows > LLVM.Other::Unknown Unit Message ("")
190 mswindows > LLVM.Other::Unknown Unit Message ("")
View Full Test Results (74 Failed)

Event Timeline

michele.scandale created this revision.Jul 8 2020, 11:53 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJul 8 2020, 11:53 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: cfe-commits, sstefan1, martong and 2 others. · View Herald Transcript
michele.scandale abandoned this revision.Jul 8 2020, 12:05 PM
Harbormaster failed remote builds in B63460: Diff 276507!Jul 8 2020, 1:00 PM

Revision Contents

PathSize
clang/
15 lines
lib/
ARCMigrate/
3 lines
AST/
1 line
ASTMatchers/
3 lines
Dynamic/
3 lines
Analysis/
3 lines
Basic/
3 lines
Frontend/
Rewrite/
3 lines
Index/
3 lines
Parse/
3 lines
Sema/
1 line
Serialization/
3 lines
StaticAnalyzer/
Checkers/
3 lines
Core/
3 lines
Frontend/
3 lines
Tooling/
ASTDiff/
3 lines
1 line
Refactoring/
3 lines
Syntax/
3 lines
Transformer/
3 lines

Diff 276507

clang/CMakeLists.txt

cmake_minimum_required(VERSION 3.4.3) cmake_minimum_required(VERSION 3.4.3)
if(POLICY CMP0075) if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW) cmake_policy(SET CMP0075 NEW)
endif() endif()
# If we are not building as a part of LLVM, build Clang as an # If we are not building as a part of LLVM, build Clang as an
# standalone project, using LLVM as an external library: # standalone project, using LLVM as an external library:
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
project(Clang) project(Clang)
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
set(CMAKE_CXX_STANDARD_REQUIRED YES)
set(CMAKE_CXX_EXTENSIONS NO)
# Rely on llvm-config. # Rely on llvm-config.
set(CONFIG_OUTPUT) set(CONFIG_OUTPUT)
if(LLVM_CONFIG) if(LLVM_CONFIG)
set (LLVM_CONFIG_FOUND 1) set (LLVM_CONFIG_FOUND 1)
message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}") message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
message(DEPRECATION "Using llvm-config to detect the LLVM installation is \ message(DEPRECATION "Using llvm-config to detect the LLVM installation is \
deprecated. The installed cmake files should be used \ deprecated. The installed cmake files should be used \
instead. CMake should be able to detect your LLVM install \ instead. CMake should be able to detect your LLVM install \
▲ Show 20 Lines • Show All 492 Lines • ▼ Show 20 Linesoption(CLANG_INCLUDE_TESTS
${LLVM_INCLUDE_TESTS}) ${LLVM_INCLUDE_TESTS})
add_subdirectory(utils/TableGen) add_subdirectory(utils/TableGen)
add_subdirectory(include) add_subdirectory(include)
# All targets below may depend on all tablegen'd files. # All targets below may depend on all tablegen'd files.
get_property(CLANG_TABLEGEN_TARGETS GLOBAL PROPERTY CLANG_TABLEGEN_TARGETS) get_property(CLANG_TABLEGEN_TARGETS GLOBAL PROPERTY CLANG_TABLEGEN_TARGETS)
add_custom_target(clang-tablegen-targets add_custom_target(clang-tablegen-targets DEPENDS ${CLANG_TABLEGEN_TARGETS})
DEPENDS
omp_gen
${CLANG_TABLEGEN_TARGETS})
set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Misc") set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Misc")
list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets) list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets)
# Force omp_gen to be built as soon as possible because the OpenMP generated
# headers is transitively included for many Clang libraries.
if(NOT CLANG_BUILT_STANDALONE)
list(APPEND LLVM_COMMON_DEPENDS omp_gen)
endif()
# Force target to be built as soon as possible. Clang modules builds depend # Force target to be built as soon as possible. Clang modules builds depend
# header-wise on it as they ship all headers from the umbrella folders. Building # header-wise on it as they ship all headers from the umbrella folders. Building
# an entire module might include header, which depends on intrinsics_gen. # an entire module might include header, which depends on intrinsics_gen.
if(LLVM_ENABLE_MODULES AND NOT CLANG_BUILT_STANDALONE) if(LLVM_ENABLE_MODULES AND NOT CLANG_BUILT_STANDALONE)
list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen) list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen)
endif() endif()
add_subdirectory(lib) add_subdirectory(lib)
▲ Show 20 Lines • Show All 367 Lines • Show Last 20 Lines

clang/lib/ARCMigrate/CMakeLists.txt

Show All 28 Linesadd_clang_library(clangARCMigrate
clangAnalysis clangAnalysis
clangBasic clangBasic
clangEdit clangEdit
clangFrontend clangFrontend
clangLex clangLex
clangRewrite clangRewrite
clangSema clangSema
clangSerialization clangSerialization
DEPENDS
omp_gen
) )

clang/lib/AST/CMakeLists.txt

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Linesadd_clang_library(clangAST
VTTBuilder.cpp VTTBuilder.cpp
LINK_LIBS LINK_LIBS
clangBasic clangBasic
clangLex clangLex
DEPENDS DEPENDS
Opcodes Opcodes
omp_gen
) )

clang/lib/ASTMatchers/CMakeLists.txt

add_subdirectory(Dynamic) add_subdirectory(Dynamic)
set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
FrontendOpenMP FrontendOpenMP
Support Support
) )
add_clang_library(clangASTMatchers add_clang_library(clangASTMatchers
ASTMatchFinder.cpp ASTMatchFinder.cpp
ASTMatchersInternal.cpp ASTMatchersInternal.cpp
GtestMatchers.cpp GtestMatchers.cpp
LINK_LIBS LINK_LIBS
clangAST clangAST
clangBasic clangBasic
clangLex clangLex
DEPENDS
omp_gen
) )

clang/lib/ASTMatchers/Dynamic/CMakeLists.txt

Show All 17 Linesadd_clang_library(clangDynamicASTMatchers
Parser.cpp Parser.cpp
Registry.cpp Registry.cpp
VariantValue.cpp VariantValue.cpp
LINK_LIBS LINK_LIBS
clangAST clangAST
clangASTMatchers clangASTMatchers
clangBasic clangBasic
DEPENDS
omp_gen
) )

clang/lib/Analysis/CMakeLists.txt

Show All 29 Linesadd_clang_library(clangAnalysis
ThreadSafetyTIL.cpp ThreadSafetyTIL.cpp
UninitializedValues.cpp UninitializedValues.cpp
LINK_LIBS LINK_LIBS
clangAST clangAST
clangASTMatchers clangASTMatchers
clangBasic clangBasic
clangLex clangLex
DEPENDS
omp_gen
) )
add_subdirectory(plugins) add_subdirectory(plugins)

clang/lib/Basic/CMakeLists.txt

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Linesadd_clang_library(clangBasic
Targets/XCore.cpp Targets/XCore.cpp
TokenKinds.cpp TokenKinds.cpp
TypeTraits.cpp TypeTraits.cpp
Version.cpp Version.cpp
Warnings.cpp Warnings.cpp
XRayInstr.cpp XRayInstr.cpp
XRayLists.cpp XRayLists.cpp
${version_inc} ${version_inc}
DEPENDS
omp_gen
) )

clang/lib/Frontend/Rewrite/CMakeLists.txt

Show All 14 Linesadd_clang_library(clangRewriteFrontend
LINK_LIBS LINK_LIBS
clangAST clangAST
clangBasic clangBasic
clangEdit clangEdit
clangFrontend clangFrontend
clangLex clangLex
clangRewrite clangRewrite
clangSerialization clangSerialization
DEPENDS
omp_gen
) )

clang/lib/Index/CMakeLists.txt

Show All 21 Linesadd_clang_library(clangIndex
clangAST clangAST
clangBasic clangBasic
clangFormat clangFormat
clangFrontend clangFrontend
clangLex clangLex
clangRewrite clangRewrite
clangSerialization clangSerialization
clangToolingCore clangToolingCore
DEPENDS
omp_gen
) )

clang/lib/Parse/CMakeLists.txt

Show All 21 Linesadd_clang_library(clangParse
ParseTentative.cpp ParseTentative.cpp
Parser.cpp Parser.cpp
LINK_LIBS LINK_LIBS
clangAST clangAST
clangBasic clangBasic
clangLex clangLex
clangSema clangSema
DEPENDS
omp_gen
) )

clang/lib/Sema/CMakeLists.txt

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Linesadd_clang_library(clangSema
SemaTemplateInstantiate.cpp SemaTemplateInstantiate.cpp
SemaTemplateInstantiateDecl.cpp SemaTemplateInstantiateDecl.cpp
SemaTemplateVariadic.cpp SemaTemplateVariadic.cpp
SemaType.cpp SemaType.cpp
TypeLocBuilder.cpp TypeLocBuilder.cpp
DEPENDS DEPENDS
ClangOpenCLBuiltinsImpl ClangOpenCLBuiltinsImpl
omp_gen
LINK_LIBS LINK_LIBS
clangAST clangAST
clangAnalysis clangAnalysis
clangBasic clangBasic
clangEdit clangEdit
clangLex clangLex
) )

clang/lib/Serialization/CMakeLists.txt

Show All 24 Linesadd_clang_library(clangSerialization
ASTCommon.h ASTCommon.h
ASTReaderInternals.h ASTReaderInternals.h
LINK_LIBS LINK_LIBS
clangAST clangAST
clangBasic clangBasic
clangLex clangLex
clangSema clangSema
DEPENDS
omp_gen
) )

clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt

Show First 20 Lines • Show All 129 Lines • ▼ Show 20 Linesadd_clang_library(clangStaticAnalyzerCheckers
LINK_LIBS LINK_LIBS
clangAST clangAST
clangASTMatchers clangASTMatchers
clangAnalysis clangAnalysis
clangBasic clangBasic
clangLex clangLex
clangStaticAnalyzerCore clangStaticAnalyzerCore
DEPENDS
omp_gen
) )

clang/lib/StaticAnalyzer/Core/CMakeLists.txt

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Linesadd_clang_library(clangStaticAnalyzerCore
clangASTMatchers clangASTMatchers
clangAnalysis clangAnalysis
clangBasic clangBasic
clangCrossTU clangCrossTU
clangFrontend clangFrontend
clangLex clangLex
clangRewrite clangRewrite
clangToolingCore clangToolingCore
DEPENDS
omp_gen
) )

clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt

Show All 17 Linesadd_clang_library(clangStaticAnalyzerFrontend
clangASTMatchers clangASTMatchers
clangAnalysis clangAnalysis
clangBasic clangBasic
clangCrossTU clangCrossTU
clangFrontend clangFrontend
clangLex clangLex
clangStaticAnalyzerCheckers clangStaticAnalyzerCheckers
clangStaticAnalyzerCore clangStaticAnalyzerCore
DEPENDS
omp_gen
) )

clang/lib/Tooling/ASTDiff/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
Support Support
) )
add_clang_library(clangToolingASTDiff add_clang_library(clangToolingASTDiff
ASTDiff.cpp ASTDiff.cpp
LINK_LIBS LINK_LIBS
clangBasic clangBasic
clangAST clangAST
clangLex clangLex
DEPENDS
omp_gen
) )

clang/lib/Tooling/CMakeLists.txt

Show All 25 Linesadd_clang_library(clangTooling
JSONCompilationDatabase.cpp JSONCompilationDatabase.cpp
Refactoring.cpp Refactoring.cpp
RefactoringCallbacks.cpp RefactoringCallbacks.cpp
StandaloneExecution.cpp StandaloneExecution.cpp
Tooling.cpp Tooling.cpp
DEPENDS DEPENDS
ClangDriverOptions ClangDriverOptions
omp_gen
LINK_LIBS LINK_LIBS
clangAST clangAST
clangASTMatchers clangASTMatchers
clangBasic clangBasic
clangDriver clangDriver
clangFormat clangFormat
clangFrontend clangFrontend
clangLex clangLex
clangRewrite clangRewrite
clangSerialization clangSerialization
clangToolingCore clangToolingCore
) )

clang/lib/Tooling/Refactoring/CMakeLists.txt

Show All 16 Linesadd_clang_library(clangToolingRefactoring
clangAST clangAST
clangASTMatchers clangASTMatchers
clangBasic clangBasic
clangFormat clangFormat
clangIndex clangIndex
clangLex clangLex
clangRewrite clangRewrite
clangToolingCore clangToolingCore
DEPENDS
omp_gen
) )

clang/lib/Tooling/Syntax/CMakeLists.txt

Show All 9 Linesadd_clang_library(clangToolingSyntax
Tree.cpp Tree.cpp
LINK_LIBS LINK_LIBS
clangAST clangAST
clangBasic clangBasic
clangFrontend clangFrontend
clangLex clangLex
clangToolingCore clangToolingCore
DEPENDS
omp_gen
) )

clang/lib/Tooling/Transformer/CMakeLists.txt

Show All 13 Linesadd_clang_library(clangTransformer
LINK_LIBS LINK_LIBS
clangAST clangAST
clangASTMatchers clangASTMatchers
clangBasic clangBasic
clangLex clangLex
clangToolingCore clangToolingCore
clangToolingRefactoring clangToolingRefactoring
DEPENDS
omp_gen
) )