diff --git a/recipes/recipes/llvm-tblgen/build.sh b/recipes/recipes/llvm-tblgen/build.sh new file mode 100644 index 00000000000..5ed4240e059 --- /dev/null +++ b/recipes/recipes/llvm-tblgen/build.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +mkdir build +cd build +cmake -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=host -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" ../llvm/ +make llvm-tblgen clang-tblgen -j$(nproc --all) + +mkdir -p $PREFIX/bin +cp bin/llvm-tblgen $PREFIX/bin/ +cp bin/clang-tblgen $PREFIX/bin/ +cp bin/llvm-lit $PREFIX/bin/ +cp bin/llvm-min-tblgen $PREFIX/bin/ \ No newline at end of file diff --git a/recipes/recipes/llvm-tblgen/recipe.yaml b/recipes/recipes/llvm-tblgen/recipe.yaml new file mode 100644 index 00000000000..0b5addccd6f --- /dev/null +++ b/recipes/recipes/llvm-tblgen/recipe.yaml @@ -0,0 +1,38 @@ +context: + version: 20.1.5 + +package: + name: llvm-tblgen + version: ${{ version }} + +source: + url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${{ version + }}.tar.gz + sha256: 205c436f93a7e185cf9d63ae57e645f23561a4d1bf854f2c5bd78995a43a5c05 + +build: + number: 0 + +requirements: + build: + - cmake + - make # [unix] + +tests: +- package_contents: + files: + - bin/llvm-tblgen + - bin/clang-tblgen + +about: + license: Apache-2.0 WITH LLVM-exception + license_family: Apache + license_file: LICENSE.TXT + summary: The LLVM Project is a collection of modular and reusable compiler and toolchain + technologies. + homepage: https://llvm.org + +extra: + recipe-maintainers: + - DerThorsten + - anutosh491 diff --git a/recipes/recipes_emscripten/llvm/build.sh b/recipes/recipes_emscripten/llvm/build.sh index b16688c5de8..2cae16499b1 100644 --- a/recipes/recipes_emscripten/llvm/build.sh +++ b/recipes/recipes_emscripten/llvm/build.sh @@ -1,3 +1,5 @@ +#!/bin/bash + mkdir build cd build @@ -30,7 +32,9 @@ emcmake cmake ${CMAKE_ARGS} -S ../llvm -B . \ -DCLANG_ENABLE_ARCMT=OFF \ -DCLANG_ENABLE_BOOTSTRAP=OFF \ -DCLANG_BUILD_TOOLS=OFF \ - -DCMAKE_CXX_FLAGS="-Dwait4=__syscall_wait4 -fexceptions" + -DCMAKE_CXX_FLAGS="-Dwait4=__syscall_wait4 -fexceptions" \ + -DLLVM_TABLEGEN=$BUILD_PREFIX/bin/llvm-tblgen \ + -DCLANG_TABLEGEN=$BUILD_PREFIX/bin/clang-tblgen # Build and Install step emmake make clangInterpreter lldWasm -j16 install diff --git a/recipes/recipes_emscripten/llvm/patches/cross_compile.patch b/recipes/recipes_emscripten/llvm/patches/cross_compile.patch deleted file mode 100644 index 68a6de4c654..00000000000 --- a/recipes/recipes_emscripten/llvm/patches/cross_compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake -index 6af47b51d4c6..c635e7f5be9e 100644 ---- a/llvm/cmake/modules/CrossCompile.cmake -+++ b/llvm/cmake/modules/CrossCompile.cmake -@@ -70,8 +70,8 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) - add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt - COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" - -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}" -- -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}" -- -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}" -+ -DCMAKE_C_COMPILER="clang" -+ -DCMAKE_CXX_COMPILER="clang++" - ${CROSS_TOOLCHAIN_FLAGS_${target_name}} ${CMAKE_CURRENT_SOURCE_DIR} - ${CROSS_TOOLCHAIN_FLAGS_${project_name}_${target_name}} - -DLLVM_TARGET_IS_CROSSCOMPILE_HOST=TRUE diff --git a/recipes/recipes_emscripten/llvm/recipe.yaml b/recipes/recipes_emscripten/llvm/recipe.yaml index 95aee7e9869..40ddc58651e 100644 --- a/recipes/recipes_emscripten/llvm/recipe.yaml +++ b/recipes/recipes_emscripten/llvm/recipe.yaml @@ -10,12 +10,11 @@ source: }}.tar.gz sha256: 205c436f93a7e185cf9d63ae57e645f23561a4d1bf854f2c5bd78995a43a5c05 patches: - - patches/cross_compile.patch - patches/shift_temporary_files_to_tmp_dir.patch - patches/enable_exception_handling.patch build: - number: 0 + number: 1 requirements: build: @@ -23,7 +22,8 @@ requirements: - ${{ compiler("cxx") }} - cmake - make # [unix] - + - llvm-tblgen + tests: - package_contents: files: