diff --git a/bazel/external/llvm13.BUILD b/bazel/external/llvm13.BUILD deleted file mode 100644 index 43dfe527d..000000000 --- a/bazel/external/llvm13.BUILD +++ /dev/null @@ -1,117 +0,0 @@ -load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake") - -licenses(["notice"]) # Apache 2 - -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "srcs", - srcs = glob(["**"]), -) - -cmake( - name = "llvm_lib", - cache_entries = { - # Disable both: BUILD and INCLUDE, since some of the INCLUDE - # targets build code instead of only generating build files. - "LLVM_BUILD_BENCHMARKS": "off", - "LLVM_INCLUDE_BENCHMARKS": "off", - "LLVM_BUILD_DOCS": "off", - "LLVM_INCLUDE_DOCS": "off", - "LLVM_BUILD_EXAMPLES": "off", - "LLVM_INCLUDE_EXAMPLES": "off", - "LLVM_BUILD_RUNTIME": "off", - "LLVM_BUILD_RUNTIMES": "off", - "LLVM_INCLUDE_RUNTIMES": "off", - "LLVM_BUILD_TESTS": "off", - "LLVM_INCLUDE_TESTS": "off", - "LLVM_BUILD_TOOLS": "off", - "LLVM_INCLUDE_TOOLS": "off", - "LLVM_BUILD_UTILS": "off", - "LLVM_INCLUDE_UTILS": "off", - "LLVM_ENABLE_IDE": "off", - "LLVM_ENABLE_LIBEDIT": "off", - "LLVM_ENABLE_LIBXML2": "off", - "LLVM_ENABLE_TERMINFO": "off", - "LLVM_ENABLE_ZLIB": "off", - "LLVM_TARGETS_TO_BUILD": "X86", - "CMAKE_CXX_FLAGS": "-Wno-unused-command-line-argument", - }, - generate_args = ["-GNinja"], - lib_source = ":srcs", - out_static_libs = [ - "libLLVMWindowsManifest.a", - "libLLVMXRay.a", - "libLLVMLibDriver.a", - "libLLVMDlltoolDriver.a", - "libLLVMCoverage.a", - "libLLVMLineEditor.a", - "libLLVMX86Disassembler.a", - "libLLVMX86AsmParser.a", - "libLLVMX86CodeGen.a", - "libLLVMX86Desc.a", - "libLLVMX86Info.a", - "libLLVMOrcJIT.a", - "libLLVMMCJIT.a", - "libLLVMJITLink.a", - "libLLVMInterpreter.a", - "libLLVMExecutionEngine.a", - "libLLVMRuntimeDyld.a", - "libLLVMOrcTargetProcess.a", - "libLLVMOrcShared.a", - "libLLVMDWP.a", - "libLLVMSymbolize.a", - "libLLVMDebugInfoPDB.a", - "libLLVMDebugInfoGSYM.a", - "libLLVMOption.a", - "libLLVMObjectYAML.a", - "libLLVMMCA.a", - "libLLVMMCDisassembler.a", - "libLLVMLTO.a", - "libLLVMPasses.a", - "libLLVMCFGuard.a", - "libLLVMCoroutines.a", - "libLLVMObjCARCOpts.a", - "libLLVMipo.a", - "libLLVMVectorize.a", - "libLLVMLinker.a", - "libLLVMInstrumentation.a", - "libLLVMFrontendOpenMP.a", - "libLLVMFrontendOpenACC.a", - "libLLVMExtensions.a", - "libLLVMDWARFLinker.a", - "libLLVMGlobalISel.a", - "libLLVMMIRParser.a", - "libLLVMAsmPrinter.a", - "libLLVMDebugInfoMSF.a", - "libLLVMDebugInfoDWARF.a", - "libLLVMSelectionDAG.a", - "libLLVMCodeGen.a", - "libLLVMIRReader.a", - "libLLVMAsmParser.a", - "libLLVMInterfaceStub.a", - "libLLVMFileCheck.a", - "libLLVMFuzzMutate.a", - "libLLVMTarget.a", - "libLLVMScalarOpts.a", - "libLLVMInstCombine.a", - "libLLVMAggressiveInstCombine.a", - "libLLVMTransformUtils.a", - "libLLVMBitWriter.a", - "libLLVMAnalysis.a", - "libLLVMProfileData.a", - "libLLVMObject.a", - "libLLVMTextAPI.a", - "libLLVMMCParser.a", - "libLLVMMC.a", - "libLLVMDebugInfoCodeView.a", - "libLLVMBitReader.a", - "libLLVMCore.a", - "libLLVMRemarks.a", - "libLLVMBitstreamReader.a", - "libLLVMBinaryFormat.a", - "libLLVMTableGen.a", - "libLLVMSupport.a", - "libLLVMDemangle.a", - ], -) diff --git a/bazel/external/llvm13.patch b/bazel/external/llvm13.patch deleted file mode 100644 index dbe1df125..000000000 --- a/bazel/external/llvm13.patch +++ /dev/null @@ -1,22 +0,0 @@ -# Workaround for different linkers used in cmake()'s generate and build steps. -# See: https://github.com/bazelbuild/rules_foreign_cc/issues/863 - -diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake -index 0c3419390c27..352e9402d808 100644 ---- a/cmake/modules/HandleLLVMOptions.cmake -+++ b/cmake/modules/HandleLLVMOptions.cmake -@@ -917,14 +917,6 @@ if (UNIX AND - append("-fdiagnostics-color" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - endif() - --# lld doesn't print colored diagnostics when invoked from Ninja --if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja") -- include(LLVMCheckLinkerFlag) -- llvm_check_linker_flag(CXX "-Wl,--color-diagnostics" LINKER_SUPPORTS_COLOR_DIAGNOSTICS) -- append_if(LINKER_SUPPORTS_COLOR_DIAGNOSTICS "-Wl,--color-diagnostics" -- CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS) --endif() -- - # Add flags for add_dead_strip(). - # FIXME: With MSVS, consider compiling with /Gy and linking with /OPT:REF? - # But MinSizeRel seems to add that automatically, so maybe disable these diff --git a/bazel/external/wamr.BUILD b/bazel/external/wamr.BUILD index 2945ef963..f25b9f074 100644 --- a/bazel/external/wamr.BUILD +++ b/bazel/external/wamr.BUILD @@ -12,7 +12,6 @@ filegroup( cmake( name = "wamr_lib", cache_entries = { - "LLVM_DIR": "$EXT_BUILD_DEPS/copy_llvm13/llvm/lib/cmake/llvm", "WAMR_BUILD_INTERP": "1", "WAMR_BUILD_FAST_INTERP": "1", "WAMR_BUILD_JIT": "0", @@ -26,7 +25,4 @@ cmake( generate_args = ["-GNinja"], lib_source = ":srcs", out_static_libs = ["libvmlib.a"], - deps = [ - "@llvm13//:llvm_lib", - ], ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index e13202393..2970b6936 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -155,17 +155,6 @@ def proxy_wasm_cpp_host_repositories(): actual = "@com_github_bytecodealliance_wasm_micro_runtime//:wamr_lib", ) - maybe( - http_archive, - name = "llvm13", - build_file = "@proxy_wasm_cpp_host//bazel/external:llvm13.BUILD", - sha256 = "408d11708643ea826f519ff79761fcdfc12d641a2510229eec459e72f8163020", - strip_prefix = "llvm-13.0.0.src", - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/llvm-13.0.0.src.tar.xz", - patches = ["@proxy_wasm_cpp_host//bazel/external:llvm13.patch"], - patch_args = ["-p1"], - ) - # Wasmtime with dependencies. maybe(