From 393576fc015a41221a6d8abcec079f9a3cf89f8b Mon Sep 17 00:00:00 2001 From: Yann Sionneau Date: Mon, 10 Aug 2015 12:00:10 +0200 Subject: [PATCH 1/2] conda: add missing build.sh for llvmdev-or1k pkg --- conda/llvmdev-or1k/build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conda/llvmdev-or1k/build.sh diff --git a/conda/llvmdev-or1k/build.sh b/conda/llvmdev-or1k/build.sh new file mode 100644 index 000000000..9310d567d --- /dev/null +++ b/conda/llvmdev-or1k/build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +cd tools +git clone https://github.com/openrisc/clang-or1k clang +cd .. +mkdir build +cd build +cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DCMAKE_BUILD_TYPE=Debug +make -j2 +make install From c57ce6d75006c211d7be4331a0a89103c6c268eb Mon Sep 17 00:00:00 2001 From: Yann Sionneau Date: Mon, 10 Aug 2015 12:23:05 +0200 Subject: [PATCH 2/2] conda: llvmdev should be built in Release mode with assertions enabled --- conda/llvmdev-or1k/bld.bat | 3 ++- conda/llvmdev-or1k/build.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conda/llvmdev-or1k/bld.bat b/conda/llvmdev-or1k/bld.bat index ef75e9db1..2c93638ee 100644 --- a/conda/llvmdev-or1k/bld.bat +++ b/conda/llvmdev-or1k/bld.bat @@ -11,7 +11,8 @@ set CMAKE_GENERATOR_TOOLSET=v120_xp @rem Reduce build times and package size by removing unused stuff set CMAKE_CUSTOM=-DLLVM_TARGETS_TO_BUILD=OR1K -DLLVM_INCLUDE_TESTS=OFF ^ -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF ^ --DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF +-DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF ^ +-DLLVM_ENABLE_ASSERTIONS=ON cmake -G "%CMAKE_GENERATOR%" -T "%CMAKE_GENERATOR_TOOLSET%" ^ -DCMAKE_BUILD_TYPE="%BUILD_CONFIG%" -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% %CMAKE_CUSTOM% %SRC_DIR% diff --git a/conda/llvmdev-or1k/build.sh b/conda/llvmdev-or1k/build.sh index 9310d567d..391f592cc 100644 --- a/conda/llvmdev-or1k/build.sh +++ b/conda/llvmdev-or1k/build.sh @@ -5,6 +5,6 @@ git clone https://github.com/openrisc/clang-or1k clang cd .. mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DCMAKE_BUILD_TYPE=Debug +cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DLLVM_TARGETS_TO_BUILD="OR1K;X86" -DCMAKE_BUILD_TYPE=Rel -DLLVM_ENABLE_ASSERTIONS=ON make -j2 make install