Author: Francesco Petrogalli Date: 2023-01-23T22:31:34+01:00 New Revision: 20ffb9aaf982f341c1ea34808e002daa5be0df76
URL: https://github.com/llvm/llvm-project/commit/20ffb9aaf982f341c1ea34808e002daa5be0df76 DIFF: https://github.com/llvm/llvm-project/commit/20ffb9aaf982f341c1ea34808e002daa5be0df76.diff LOG: Revert "[build] Fix stand-alone builds of clang." It breaks some builds [1] with the following error: ``` ccache /usr/bin/c++ -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.build/tools/clang/lib/Basic -I/home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.src/clang/lib/Basic -I/home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.src/clang/include -I/home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.build/tools/clang/include -I/home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.build/include -I/home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.src/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wno-misleading-indentation -fdiagnostics-color -ffunction-sections -fdata-sections -fno-common -Woverloaded-virtual -fno-strict-aliasing -O3 -DNDEBUG -fno-exceptions -fno-rtti -UNDEBUG -std=c++17 -MD -MT tools/clang/lib/Basic/CMakeFiles/obj.clangBasic.dir/Targets/RISCV.cpp.o -MF tools/clang/lib/Basic/CMakeFiles/obj.clangBasic.dir/Targets/RISCV.cpp.o.d -o tools/clang/lib/Basic/CMakeFiles/obj.clangBasic.dir/Targets/RISCV.cpp.o -c /home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.src/clang/lib/Basic/Targets/RISCV.cpp In file included from /home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.src/clang/lib/Basic/Targets/RISCV.cpp:19: /home/omp-vega20-0/bbot/openmp-offload-amdgpu-runtime/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:29:10: fatal error: llvm/TargetParser/RISCVTargetParserDef.inc: No such file or directory 29 | #include "llvm/TargetParser/RISCVTargetParserDef.inc" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. 2.225 [3029/31/825] Building CXX object tools/clang/lib/Basic/CMakeFiles/obj.clangBasic.dir/Version.cpp.o 2.524 [3029/30/826] Building RISCVTargetParserDef.inc... ``` [1] https://lab.llvm.org/buildbot/#/builders/193/builds/25362 This reverts commit 52bcdac3b8425e20023151bb726b56fd6f62ec17. Added: Modified: clang/lib/Basic/CMakeLists.txt clang/lib/Driver/CMakeLists.txt llvm/cmake/modules/LLVMConfig.cmake.in Removed: ################################################################################ diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt index 936709da9716a..32af83ee23f31 100644 --- a/clang/lib/Basic/CMakeLists.txt +++ b/clang/lib/Basic/CMakeLists.txt @@ -110,6 +110,7 @@ add_clang_library(clangBasic DEPENDS omp_gen + RISCVTargetParserTableGen ) target_link_libraries(clangBasic diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt index 0b6ce9145c651..ba56a9323400c 100644 --- a/clang/lib/Driver/CMakeLists.txt +++ b/clang/lib/Driver/CMakeLists.txt @@ -93,6 +93,7 @@ add_clang_library(clangDriver DEPENDS ClangDriverOptions + RISCVTargetParserTableGen LINK_LIBS clangBasic diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in index bae2a07c0fb16..f1362fa032c2b 100644 --- a/llvm/cmake/modules/LLVMConfig.cmake.in +++ b/llvm/cmake/modules/LLVMConfig.cmake.in @@ -140,9 +140,9 @@ if(NOT TARGET LLVMSupport) @llvm_config_include_buildtree_only_exports@ endif() -# By creating the following targets here, subprojects that depend on -# LLVM's tablegen-generated headers can always depend on this target -# whether building in-tree with LLVM or not. +# By creating intrinsics_gen, omp_gen and acc_gen here, subprojects that depend +# on LLVM's tablegen-generated headers can always depend on this target whether +# building in-tree with LLVM or not. if(NOT TARGET intrinsics_gen) add_custom_target(intrinsics_gen) endif() @@ -152,9 +152,6 @@ endif() if(NOT TARGET acc_gen) add_custom_target(acc_gen) endif() -if(NOT TARGET RISCVTargetParserTableGen) - add_custom_target(RISCVTargetParserTableGen) -endif() set_property(GLOBAL PROPERTY LLVM_TARGETS_CONFIGURED On) include(${LLVM_CMAKE_DIR}/LLVM-Config.cmake) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits